[#3199] Only update the latest revision

ckan · Aug 9, 2016 · 4ecbe21 · 4ecbe21
1 parent ddc83d4
commit 4ecbe21
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py
@@ -1093,6 +1093,7 @@ def _bulk_update_dataset(context, data_dict, update_dict):
     model.Session.query(model.package_revision_table) \
         .filter(model.PackageRevision.id.in_(datasets)) \
         .filter(model.PackageRevision.owner_org == org_id) \
+        .filter(model.PackageRevision.current is True) \
         .update(update_dict, synchronize_session=False)
 
     model.Session.commit()

diff --git a/ckan/tests/logic/action/test_update.py b/ckan/tests/logic/action/test_update.py
@@ -954,7 +954,9 @@ def test_bulk_make_private(self):
             eq_(dataset.private, True)
 
         revisions = model.Session.query(model.PackageRevision) \
-            .filter(model.PackageRevision.owner_org == org['id']).all()
+            .filter(model.PackageRevision.owner_org == org['id']) \
+            .filter(model.PackageRevision.current is True) \
+            .all()
         for revision in revisions:
             eq_(revision.private, True)
 
@@ -983,7 +985,9 @@ def test_bulk_make_public(self):
             eq_(dataset.private, False)
 
         revisions = model.Session.query(model.PackageRevision) \
-            .filter(model.PackageRevision.owner_org == org['id']).all()
+            .filter(model.PackageRevision.owner_org == org['id']) \
+            .filter(model.PackageRevision.current is True) \
+            .all()
         for revision in revisions:
             eq_(revision.private, False)
 
@@ -1011,6 +1015,8 @@ def test_bulk_delete(self):
             eq_(dataset.state, 'deleted')
 
         revisions = model.Session.query(model.PackageRevision) \
-            .filter(model.PackageRevision.owner_org == org['id']).all()
+            .filter(model.PackageRevision.owner_org == org['id']) \
+            .filter(model.PackageRevision.current is True) \
+            .all()
         for revision in revisions:
             eq_(revision.state, 'deleted')