[Mpuls-commits] r5331 - base/trunk/mpulsweb/model

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-09-14 17:01:26 +0200 (Wed, 14 Sep 2011)
New Revision: 5331

Modified:
   base/trunk/mpulsweb/model/meta.py
Log:
Allow revoking permission to transfer data to the meta server even if the case
is not linked with a meta case.


Modified: base/trunk/mpulsweb/model/meta.py
===================================================================
--- base/trunk/mpulsweb/model/meta.py	2011-09-14 13:52:21 UTC (rev 5330)
+++ base/trunk/mpulsweb/model/meta.py	2011-09-14 15:01:26 UTC (rev 5331)
@@ -245,15 +245,18 @@
 
     def delete_metacase_and_reset(self):
         """Delete the meta case and afterwards reset the meta settings."""
-        self.delete_metacase()
+        if self.is_linked():
+            self.delete_metacase()
         self.reset()
 
     def delete_projectdata_and_reset(self):
         """Delete the project part and afterwards reset the meta settings."""
-        self.delete_projectdata()
+        if self.is_linked():
+            self.delete_projectdata()
         self.reset()
 
     def delete_projectdata_and_unlink(self):
         """Delete the project part and afterwards reset the meta UUIDs."""
-        self.delete_projectdata()
-        self.unlink()
+        if self.is_linked():
+            self.delete_projectdata()
+            self.unlink()