Changeset 773 in main

Timestamp:

02/17/12 14:03:14 (10 years ago)

Author:

pcosquer

Message:

revision: resising a cancelled or deprecated object is now forbidden

Location:

trunk/openPLM/plmapp

Files:

• controllers/plmobject.py (modified) (1 diff)
• tests/controllers/plmobject.py (modified) (2 diffs)

trunk/openPLM/plmapp/controllers/plmobject.py

@@ -270 +270 @@
            rx_bad_ref.search(new_revision):
             raise RevisionError("Bad value for new_revision")
-        if models.RevisionLink.objects.filter(old=self.object.pk):
-            raise RevisionError("a revision already exists for %s" % self.object)
+        if self.is_cancelled or self.is_deprecated:
+            raise RevisionError("Object is deprecated or cancelled.")
+        if models.RevisionLink.objects.filter(old=self.object.pk).exists():
+            raise RevisionError("A revision already exists for %s" % self.object)
         data = {}
         fields = self.get_modification_fields() + self.get_creation_fields()

trunk/openPLM/plmapp/tests/controllers/plmobject.py

@@ -167 +167 @@
         self.assertEqual(user, rev.owner)
 
+    def assertOneRevision(self, ctrl):
+        count = models.PLMObject.objects.filter(reference=ctrl.reference).count()
+        self.assertEqual(1, count)
+
     def test_revise_error_other_group(self):
         """
@@ -177 +181 @@
         self.failIf(ctrl.is_revisable())
         self.assertRaises(exc.PermissionError, ctrl.revise, "b")
-        count = models.PLMObject.objects.filter(reference=controller.reference).count()
-        self.assertEqual(1, count)
-
-    def test_revise_error1(self):
+        self.assertOneRevision(controller)
+
+    def test_revise_error_empty_revision(self):
         "Revision : error : empty new revision"
         controller = self.create("Part1")
         self.assertRaises(exc.RevisionError, controller.revise, "")
-        count = models.PLMObject.objects.filter(reference=controller.reference).count()
-        self.assertEqual(1, count)
+        self.assertOneRevision(controller)
     
-    def test_revise_error2(self):
+    def test_revise_error_same_revision(self):
         "Revision : error : same revision name"
         controller = self.create("Part1")
         self.assertRaises(exc.RevisionError, controller.revise, "a")
-        count = models.PLMObject.objects.filter(reference=controller.reference).count()
-        self.assertEqual(1, count)
+        self.assertOneRevision(controller)
+
+    def test_revise_error_cancelled_object(self):
+        """ Tests it is not possible to revise a cancelled object."""
+        controller = self.create("Part1")
+        controller.cancel()
+        self.assertFalse(controller.is_revisable())
+        self.assertRaises(exc.RevisionError, controller.revise, "n")
+        self.assertOneRevision(controller)
+
+    def test_revise_error_deprecated_object(self):
+        """ Tests it is not possible to revise a deprecated object."""
+        controller = self.create("Part1")
+        controller.object.is_promotable = lambda: True
+        controller.promote()
+        controller.promote()
+        self.assertFalse(controller.is_revisable())
+        self.assertRaises(exc.RevisionError, controller.revise, "n")
+        self.assertOneRevision(controller)
 
     def test_promote_to_official_revision_previous_is_official(self):