[Checkins] SVN: z3c.securitytool/trunk/src/z3c/securitytool/ Added onChange for selectedPermission, Removed empty permission selection, added - All Permissions - selection

[Daniel Blackburn]

Log message for revision 83658:
  Added onChange for selectedPermission, Removed empty permission selection, added - All Permissions - selection

Changed:
  U   z3c.securitytool/trunk/src/z3c/securitytool/README.txt
  U   z3c.securitytool/trunk/src/z3c/securitytool/browser/viewprincipalmatrix.pt
  U   z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py
  U   z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py

-=-
Modified: z3c.securitytool/trunk/src/z3c/securitytool/README.txt
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/README.txt	2008-02-08 00:13:09 UTC (rev 83657)
+++ z3c.securitytool/trunk/src/z3c/securitytool/README.txt	2008-02-08 00:27:06 UTC (rev 83658)
@@ -284,7 +284,7 @@
       u'OPTIONS': 'zope.Public',
       u'PUT': 'zope.Public',
       u'absolute_url': 'zope.Public'},
-     set([None])]
+     set(['zope.Public'])]
 
 
 Following are the helper functions used within the securitytool, These

Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/viewprincipalmatrix.pt
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/viewprincipalmatrix.pt	2008-02-08 00:13:09 UTC (rev 83657)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/viewprincipalmatrix.pt	2008-02-08 00:27:06 UTC (rev 83658)
@@ -40,7 +40,7 @@
          <select name="selectedPermission"
            tal:attributes="onchange string:javascript:document.form.submit();"
            tal:define="selPerm request/session:securitytool/selectedPermission|nothing">
-            <option value="None">---</option>
+            <option value="None">- All Permissions -</option>
             <option value="Permission"
                tal:repeat="permission view/getPermissionList"
                tal:attributes="value permission; 

Modified: z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py	2008-02-08 00:13:09 UTC (rev 83657)
+++ z3c.securitytool/trunk/src/z3c/securitytool/browser/views.py	2008-02-08 00:27:06 UTC (rev 83658)
@@ -26,6 +26,10 @@
     evenOddClasses = ('even','odd')
     evenodd = 0
 
+    def __call__(self):
+        self.update()
+        return self.render()
+
     def update(self):
         skin = self.handleSkinSelection()
         perm = self.handlePermissionSelection()
@@ -40,6 +44,9 @@
 
         self.sortViews()
 
+    def render(self):
+        return  ViewPageTemplateFile(self.pageTemplateFile)(self)
+
     def handleSkinSelection(self):
         """ This method handles the logic for the selectedSkin
             widget and session storage for the widget
@@ -82,7 +89,6 @@
                                                      selectedPermission
         return selectedPermission        
 
-
     def sortViews(self):
         """ self.views is a dict in the form of {view:perm}
             Here It would make more sense to group by permission
@@ -107,7 +113,6 @@
             self.evenodd = 0
         return self.evenOddClasses[self.evenodd]
 
-
     def getPermissionSetting(self, view, principal):
         try:
             return self.viewMatrix[principal][view]
@@ -133,18 +138,10 @@
             urlNames[key] = urllib.quote(key)
         return urlNames
 
-
     def getPermissionList(self):
         """ returns sorted permission list"""
         return sorted(self.permissions)
 
-    def render(self):
-        return  ViewPageTemplateFile(self.pageTemplateFile)(self)
-
-    def __call__(self):
-        self.update()
-        return self.render()
-
 class PrincipalDetails(BrowserView):
     """ view class for ud.html (User Details)"""
     pageTemplateFile = "principalinfo.pt"

Modified: z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py	2008-02-08 00:13:09 UTC (rev 83657)
+++ z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py	2008-02-08 00:27:06 UTC (rev 83658)
@@ -77,9 +77,10 @@
 
         info = getViewInfoDictionary(view_reg)
         read_perm = info['read_perm']
-        self.permissions.add(read_perm)
         if read_perm == None:
             read_perm = 'zope.Public'
+        self.permissions.add(read_perm)
+
         if self.selectedPermission and self.selectedPermission != read_perm:
             return 
         self.name = info['name']