Changeset 65

Timestamp:

2009年02月24日 14时13分58秒 (3 years ago)

Author:

jiangx

Message:

Fixed #16: Blank setting can also be saved.

Location:

trunk/pysvnmanager/hooks/plugins

Files:

• CommitLogCheck.py (modified) (1 diff)
• ReadonlySvnMirror.py (modified) (3 diffs)
• __init__.py (modified) (2 diffs)

trunk/pysvnmanager/hooks/plugins/CommitLogCheck.py

@@ -159 +159 @@
         self.set_config(self.key_switch, switch)
         self.set_config(self.key_size, size)
-        if permit:
-            self.set_config(self.key_permit, permit)
-        if prohibit:
-            self.set_config(self.key_prohibit, prohibit)
+        self.set_config(self.key_permit, permit)
+        self.set_config(self.key_prohibit, prohibit)
         self.save()
         

trunk/pysvnmanager/hooks/plugins/ReadonlySvnMirror.py

@@ -51 +51 @@
         Simply call 'has_config()'.
         """
-        return self.has_config(self.key_switch) and self.has_config(self.key_admin)
+        return self.has_config(self.key_switch)
     
     def install_info(self):
@@ -69 +69 @@
                 result += "- " + _("Readonly mirror disabled.")
             result += "\n"
-            result += "- " + _("Admin user: ") + "``" + self.get_config(self.key_admin) + "``"
-                
+            admin = self.get_config(self.key_admin)
+            if admin:
+                result += "- " + _("Admin user: ") + "``" + self.get_config(self.key_admin) + "``"
+
         return result
     
@@ -129 +131 @@
         admin = params.get('admin')
         if not admin:
-            raise Exception(_("Wrong configuration."))
+            switch = 'no'
         self.set_config(self.key_switch, switch)
         self.set_config(self.key_admin, admin)

trunk/pysvnmanager/hooks/plugins/__init__.py

@@ -200 +200 @@
                 key = self.key
 
-        if value == "":
-            if hasattr(self, "value"):
-                value = self.value
+        if value == "" and hasattr(self, "value"):
+            value = self.value
         
         if hasattr(self, "section"):
@@ -227 +226 @@
                 key = self.key
 
-        if value == "":
-            if not hasattr(self, "value"):
-                raise Exception, _("Plugin not fully implemented.")
-            else:
-                value = self.value
+        if value == "" and hasattr(self, "value"):
+            value = self.value
         
         if hasattr(self, "section"):