Changeset 43

Timestamp:

2008年08月25日 18时25分09秒 (4 years ago)

Author:

jiangx

Message:

See #9: add controller/view for svn plugin management.

Location:

trunk/pysvnmanager

Files:

• controllers/repos.py (added)
• hooks/plugins/__init__.py (modified) (1 diff)
• model/hooks.py (modified) (1 diff)
• templates/authz/index.mako (modified) (5 diffs)
• templates/base.mako (modified) (3 diffs)
• templates/check/index.mako (modified) (2 diffs)
• templates/repos (added)
• templates/repos/hooks.mako (added)
• templates/role/index.mako (modified) (6 diffs)
• tests/functional/test_repos.py (added)
• tests/test_repos.py (modified) (2 diffs)

trunk/pysvnmanager/hooks/plugins/__init__.py

@@ -90 +90 @@
         return self.description
     
+    detail = property(show)
+    
     def show_form(self):
         return self.description

trunk/pysvnmanager/model/hooks.py

@@ -49 +49 @@
     
     def __get_applied_plugins(self):
-        return [m for m in self.pluginnames if self.plugins[m].is_set()]
+        result={}
+        for k,v in self.plugins.iteritems():
+            if v.is_set():
+                result[k]=v
+        return result
     
     applied_plugins = property(__get_applied_plugins)
 
     def __get_unapplied_plugins(self):
-        return [m for m in self.pluginnames if not self.plugins[m].is_set()]
+        result={}
+        for k,v in self.plugins.iteritems():
+            if not v.is_set():
+                result[k]=v
+        return result
     
     unapplied_plugins = property(__get_unapplied_plugins)

trunk/pysvnmanager/templates/authz/index.mako

@@ -22 +22 @@
 all_users.sort();
 
-function clean_message()
-{
-        document.getElementById('result').innerHTML = '';
-}
-
 // Display repos list only.
 function show_init_form()
@@ -50 +45 @@
         document.getElementById('action_box').style.visibility = 'hidden';
         document.getElementById('action_box').style.position = 'absolute';
-        
-        document.getElementById('result').innerHTML = '';
 }
 
@@ -509 +502 @@
         {
                 message = '${_("Update ACL failed:")}' + message;
-                alert(message);
-                document.getElementById('result').innerHTML = message;
-                document.getElementById('result').style.visibility = 'visible'; 
+                set_message_box(message);
         }
         else
         {
                 message = '${_("Update ACL successfully.")}';
-                document.getElementById('result').innerHTML = message;
-                alert(message);
+                set_message_box(message);
                 if (document.main_form.repos_list.value == reposname)
                 {
@@ -566 +556 @@
         {
                 message = '${_("Can not delete module ")}' + reposname + ':' + path + ' : ' + message;
-                alert(message);
-                document.getElementById('result').innerHTML = message;
-                document.getElementById('result').style.visibility = 'visible'; 
+                set_message_box(message);
         }
         else
         {
                 message = '${_("Successfully delete module:")}' + reposname + ':' + path;
-                document.getElementById('result').innerHTML = message;
-                alert(message);
+                set_message_box(message);
                 repos_changed();
         }
@@ -688 +675 @@
 <tr>
   <td align='center'>
-    <div id='result'></div>
-        <br>
         <input type="hidden" name="reposname">
     <input type="button" name="save_btn"   value='${_("Save")}' onClick="save_authz(this.form)">

trunk/pysvnmanager/templates/base.mako

@@ -13 +13 @@
 
         ${self.nav_bar()}
+
+  <div id="message_box" style="visibility:hidden;position:absolute" class=gainlayout>
+  <span id="message"></span>
+  <br><a class="clear-link" href="#" onClick="document.getElementById('message').innerHTML='';switch_message_box()">Clear message</a>
+  </div>
         
     ${next.body()}
@@ -28 +33 @@
           <td>${h.link_to(_("Role management"), h.url(controller="role", id=None))}</td>
           <td>${h.link_to(_("ACL management"), h.url(controller="authz", id=None))}</td>
+          <td>${h.link_to(_("Repos management"), h.url(controller="repos", id=None))}</td>
           <td>${h.link_to(_("Logs"), h.url(controller="logs", id=None))}</td>
           <td>welcome ${session.get('user')}</td>
@@ -108 +114 @@
   document.getElementById('popup_notices').style.display = 'none';
 }
+
+function set_message_box(message)
+{
+        document.getElementById('message').innerHTML=message;
+        switch_message_box();
+}
+
+function switch_message_box()
+{
+        c=document.getElementById('message').innerHTML;
+        s=document.getElementById('message_box').style;
+        if (c)
+        {
+                s.visibility='visible';
+                s.position = 'relative';
+        }
+        else
+        {
+                s.visibility='hidden';
+                s.position = 'absolute';
+        }
+}
 </script>
 </%def>

trunk/pysvnmanager/templates/check/index.mako

@@ -115 +115 @@
             html={'id':'main_form'}, 
             url=h.url(action='access_map'), 
-            update=dict(success="acl_msg", failure="acl_error"), 
+            update=dict(success="acl_msg", failure="message"), 
             method='post', before='showNoticesPopup()',
             complete='hideNoticesPopup();'+h.visual_effect("Highlight", "acl_msg", duration=1),
@@ -183 +183 @@
 
 <div id='acl_msg'></div>
-<div id='acl_error'></div>
 

trunk/pysvnmanager/templates/role/index.mako

@@ -356 +356 @@
                 show_init_form();
 
-        document.getElementById('result').innerHTML = '';       
-
         if(name.charAt(0) == '@')
         {
@@ -420 +418 @@
                 message = '${_("Update group failed:")}' + message;
                 alert(message);
-                document.getElementById('result').innerHTML = message;
-                document.getElementById('result').style.visibility = 'visible'; 
+                set_message_box(message);
         }
         else
         {
                 message = '${_("Update group successfully.")}';
-                document.getElementById('result').innerHTML = message;
-                alert(message);
+                set_message_box(message);
                 if (document.main_form.role_list.value == rolename)
                 {
@@ -470 +466 @@
         {
                 message = '${_("Delete group failed:")}' + message;
-                alert(message);
-                document.getElementById('result').innerHTML = message;
-                document.getElementById('result').style.visibility = 'visible'; 
+                set_message_box(message);
         }
         else
         {
                 message = '${_("Delete group successfully.")}';
-                document.getElementById('result').innerHTML = message;
-                alert(message);
+                set_message_box(message);
                 reset_main_form();
         }
@@ -511 +504 @@
         {
                 message = '${_("Update alias failed:")}' + message;
-                alert(message);
-                document.getElementById('result').innerHTML = message;
-                document.getElementById('result').style.visibility = 'visible'; 
+                set_message_box(message);
         }
         else
         {
                 message = '${_("Update alias successfully.")}';
-                document.getElementById('result').innerHTML = message;
-                alert(message);
+                set_message_box(message);
                 if (document.main_form.role_list.value == aliasname)
                 {
@@ -561 +551 @@
         {
                 message = '${_("Delete alias failed:")}' + message;
-                alert(message);
-                document.getElementById('result').innerHTML = message;
-                document.getElementById('result').style.visibility = 'visible'; 
+                set_message_box(message);
         }
         else
         {
                 message = '${_("Delete alias successfully.")}';
-                document.getElementById('result').innerHTML = message;
-                alert(message);
+                set_message_box(message);
                 reset_main_form();
         }
@@ -719 +706 @@
 </DIV>
 
-<div id='result' style="position:relative;" class=gainlayout>
-</div>
-
 <!-- begin: action_box -->
 <div id='action_box' style="position:relative;" class=gainlayout>

trunk/pysvnmanager/tests/test_repos.py

@@ -88 +88 @@
         myhooks = hooks.Hooks(self.repos_root + '/repos1')
         self.assert_(myhooks.pluginnames==['CaseInsensitive', 'EolStyleCheck'], myhooks.pluginnames)
-        self.assert_(myhooks.unapplied_plugins==['CaseInsensitive', 'EolStyleCheck'], myhooks.unapplied_plugins)
+        self.assert_(myhooks.unapplied_plugins.keys()==['CaseInsensitive', 'EolStyleCheck'], myhooks.unapplied_plugins.keys())
         
         m = myhooks.plugins['CaseInsensitive']
@@ -99 +99 @@
         m = myhooks.plugins['CaseInsensitive']
         self.assert_(m.is_set()==False)
-        self.assert_(myhooks.applied_plugins==[], myhooks.applied_plugins)
-        self.assert_(myhooks.unapplied_plugins==['CaseInsensitive', 'EolStyleCheck'], myhooks.unapplied_plugins)
+        self.assert_(myhooks.applied_plugins.keys()==[], myhooks.applied_plugins.keys())
+        self.assert_(myhooks.unapplied_plugins.keys()==['CaseInsensitive', 'EolStyleCheck'], myhooks.unapplied_plugins.keys())
 
         m.set_plugin()
         self.assert_(m.is_set()==True)
-        self.assert_(myhooks.applied_plugins==['CaseInsensitive'], myhooks.applied_plugins)
-        self.assert_(myhooks.unapplied_plugins==['EolStyleCheck'], myhooks.unapplied_plugins)
+        self.assert_(myhooks.applied_plugins.keys()==['CaseInsensitive'], myhooks.applied_plugins.keys())
+        self.assert_(myhooks.unapplied_plugins.keys()==['EolStyleCheck'], myhooks.unapplied_plugins.keys())
 
         m.delete_plugin()
         self.assert_(m.is_set()==False)
-        self.assert_(myhooks.applied_plugins==[], myhooks.applied_plugins)
-        self.assert_(myhooks.unapplied_plugins==['CaseInsensitive', 'EolStyleCheck'], myhooks.unapplied_plugins)
+        self.assert_(myhooks.applied_plugins.keys()==[], myhooks.applied_plugins.keys())
+        self.assert_(myhooks.unapplied_plugins.keys()==['CaseInsensitive', 'EolStyleCheck'], myhooks.unapplied_plugins.keys())