浏览代码

Revision: created date is now content creation date

Bastien Sevajol 9 年前
父节点
当前提交
42b1080a62
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 2
      tracim/tracim/model/data.py
  2. 2 1
      tracim/tracim/tests/models/test_content.py

+ 1 - 2
tracim/tracim/model/data.py 查看文件

538
             column_value = getattr(revision, column_name)
538
             column_value = getattr(revision, column_name)
539
             setattr(new_rev, column_name, column_value)
539
             setattr(new_rev, column_name, column_value)
540
 
540
 
541
-        new_rev.created = datetime.now()
542
         new_rev.updated = datetime.now()
541
         new_rev.updated = datetime.now()
543
 
542
 
544
         return new_rev
543
         return new_rev
1187
         action_description = ActionDescription(revision.revision_type)
1186
         action_description = ActionDescription(revision.revision_type)
1188
 
1187
 
1189
         return VirtualEvent(id=revision.revision_id,
1188
         return VirtualEvent(id=revision.revision_id,
1190
-                            created=revision.created,
1189
+                            created=revision.updated,
1191
                             owner=revision.owner,
1190
                             owner=revision.owner,
1192
                             type=action_description,
1191
                             type=action_description,
1193
                             label=action_description.label,
1192
                             label=action_description.label,

+ 2 - 1
tracim/tracim/tests/models/test_content.py 查看文件

89
 
89
 
90
         # Updated dates must be different
90
         # Updated dates must be different
91
         ok_(revision_1.updated < revision_2.updated < revision_3.updated)
91
         ok_(revision_1.updated < revision_2.updated < revision_3.updated)
92
-        ok_(revision_1.created < revision_2.created < revision_3.created)
92
+        # Created dates must be equal
93
+        ok_(revision_1.created == revision_2.created == revision_3.created)
93
 
94
 
94
     def test_creates(self):
95
     def test_creates(self):
95
         eq_(0, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'TEST_CONTENT_1').count())
96
         eq_(0, DBSession.query(ContentRevisionRO).filter(ContentRevisionRO.label == 'TEST_CONTENT_1').count())