[Uludag-commits] r16260 - trunk/comar/ahenk/lider/src

[uludag-commits at pardus.org.tr]

Author: bahadir.kandemir
Date: Thu Dec  6 15:09:05 2007
New Revision: 16260

Modified:
   trunk/comar/ahenk/lider/src/dialogs.py
   trunk/comar/ahenk/lider/src/ldapview.py
Log:
Fixed apply button not working properly when unsetting attributes.

Modified: trunk/comar/ahenk/lider/src/dialogs.py
=================================================================
--- trunk/comar/ahenk/lider/src/dialogs.py	(original)
+++ trunk/comar/ahenk/lider/src/dialogs.py	Thu Dec  6 15:09:05 2007
@@ -296,9 +296,12 @@
             if self.unset and not self.grp.isChecked():
                 if not self.model.new:
                     self.unsetValues()
+                    KDialog.accept(self)
             else:
                 if self.getValues():
                     KDialog.accept(self)
+        else:
+            KDialog.accept(self)
     
     def reject(self):
         KDialog.reject(self)

Modified: trunk/comar/ahenk/lider/src/ldapview.py
=================================================================
--- trunk/comar/ahenk/lider/src/ldapview.py	(original)
+++ trunk/comar/ahenk/lider/src/ldapview.py	Thu Dec  6 15:09:05 2007
@@ -55,7 +55,7 @@
             val = str(self.text())
             if self.options.get("password", False):
                 val = saltedSHA(val)
-        if self.options.get("urlencode", False):
+        if "/" in val and self.options.get("urlencode", False):
             url, args = val.rsplit("/", 1)
             val = "%s/%s" % (url, urllib.urlencode({"x": args}).split("=", 1)[1])
         return val