damned-lies r1369 - in trunk: . vertimus

[claudep svn gnome org]

Author: claudep
Date: Tue Jan 20 15:15:31 2009
New Revision: 1369
URL: http://svn.gnome.org/viewvc/damned-lies?rev=1369&view=rev

Log:
2009-01-20  Claude Paroz  <claude 2xlibre net>

	* vertimus/views.py: Action_db2 was in fact an ActionAbstract object.

Modified:
   trunk/ChangeLog
   trunk/vertimus/views.py

Modified: trunk/vertimus/views.py
==============================================================================
--- trunk/vertimus/views.py	(original)
+++ trunk/vertimus/views.py	Tue Jan 20 15:15:31 2009
@@ -119,11 +119,11 @@
     content1 = [l.decode('utf-8') for l in open(file_path1, 'U').readlines()]
     descr1 = _("Uploaded file by %(name)s on %(date)s") % { 'name': action_db1.person.name,
                                                             'date': action_db1.created }
-    action_db2 = action_db1.get_previous_action_with_po()
-    if action_db2:
-        file_path2 = action_db2.get_action().merged_file()['path']
-        descr2 = _("Uploaded file by %(name)s on %(date)s") % { 'name': action_db2.person.name,
-                                                                'date': action_db2.created }
+    action2 = action_db1.get_previous_action_with_po()
+    if action2:
+        file_path2 = action2.merged_file()['path']
+        descr2 = _("Uploaded file by %(name)s on %(date)s") % { 'name': action2.person.name,
+                                                                'date': action2.created }
     else:
         # The file should be the more recently committed file (merged)
         try: