Changeset 44

Timestamp:

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

Author:

jiangx

Message:

Fix #8: add controller/view for svn repos add/remove management.

Location:

trunk

Files:

• README.txt (modified) (1 diff)
• development.ini (modified) (1 diff)
• pysvnmanager/controllers/repos.py (modified) (7 diffs)
• pysvnmanager/model/repos.py (modified) (2 diffs)
• pysvnmanager/templates/repos/create.mako (added)
• pysvnmanager/templates/repos/hooks.mako (modified) (7 diffs)
• pysvnmanager/templates/repos/remove.mako (added)
• setup.py (modified) (1 diff)

trunk/README.txt

@@ -18 +18 @@
 
 Then you are ready to go.
+
+Installation from Source code
+=============================
+
+Check source code from sourceforge.net::
+
+    svn co https://sourceforge.net/projects/pysvnmanager/trunk pysvnmanager
+
+Make a config file as follows::
+
+    cd pysvnmanager/config
+    make
+
+Compile l18n messages::
+    
+    cd pysvnmanager
+    python setup.py compile_catalog
+
+Start web service::
+
+    paster serve --reload develogment.ini
+
+

trunk/development.ini

@@ -78 +78 @@
 [logger_pysvnmanager]
 level = DEBUG
-handlers =
+handlers = console
 qualname = pysvnmanager
 

trunk/pysvnmanager/controllers/repos.py

@@ -6 +6 @@
 from pysvnmanager.model import repos as _repos
 from pysvnmanager.model import hooks as _hooks
-
 
 log = logging.getLogger(__name__)
@@ -33 +32 @@
 
     def init_repos_list(self):
+        filter = request.params.get('filter')
         total = 0;
         msg = ''
@@ -41 +41 @@
         total += 1;
         for reposname in self.repos_list:
+            if filter=='blank' and not self.repos.is_blank_svn_repos(reposname):
+                continue
             msg += 'id[%d]="%s";' % (total, reposname)
             msg += 'name[%d]="%s";\n' % (total, reposname)
             total += 1;
         msg += 'total=%d;\n' % total
-        msg += 'revision="%s";\n' % self.authz.version
         return msg
 
     def get_plugin_list(self):
-        reposname = request.params.get('select')        
+        reposname = request.params.get('select')
         h = _hooks.Hooks(self.repos_root + reposname)
         total = 0;
@@ -67 +68 @@
     
     def get_remove_hook_form_content(self):
-        reposname = request.params.get('select')        
+        reposname = request.params.get('select')
         h = _hooks.Hooks(self.repos_root + reposname)
         msg = ''
         if len(h.applied_plugins) > 0:
-            msg += "Installed hooks:"
+            msg += _("Installed hooks:")
             msg += "<br>\n"
             num = 0
@@ -85 +86 @@
                     msg += ' - %(detail)s' % { 'detail': detail, }
                 msg += '<br>\n'
-            msg += '<input type="submit" name="remove_hook" value="Remove selected hooks">\n'
+            msg += '<input type="submit" name="remove_hook" value="%s">\n' % _("Remove selected hooks")
 
         return msg
@@ -105 +106 @@
             plugin.set_plugin(d)
         except Exception, e:
-            result = "Apply plugin '%(plugin)s on '%(repos)s' Failed. Error message:<br>\n%(msg)s" % {
+            result = _("Apply plugin '%(plugin)s on '%(repos)s' Failed. Error message:<br>\n%(msg)s") % {
                         "plugin": pluginname, "repos":reposname, "msg": e}
         else:
-            result = "Apply plugin '%(plugin)s on '%(repos)s' success." % {
+            result = _("Apply plugin '%(plugin)s on '%(repos)s' success.") % {
                         "plugin": pluginname, "repos":reposname}
         return result
@@ -123 +124 @@
                     plugin.delete_plugin()
         except Exception, e:
-            result = "Delete plugin '%(plugin)s on '%(repos)s' Failed. Error message:<br>\n%(msg)s" % {
+            result = _("Delete plugin '%(plugin)s on '%(repos)s' Failed. Error message:<br>\n%(msg)s") % {
                         "plugin": pluginname, "repos":reposname, "msg": e}
         else:
-            result = "Delete plugin '%(plugin)s on '%(repos)s' success." % {
+            result = _("Delete plugin '%(plugin)s on '%(repos)s' success.") % {
                         "plugin": pluginname, "repos":reposname}
         return result
-    
+
+    def create_submit(self):
+        try:
+            d = request.params
+            reposname = d.get("reposname")
+            self.repos.create(reposname)
+        except Exception, e:
+            result = _("Create repository '%(repos)s' Failed. Error message:<br>\n%(msg)s") % {
+                        "repos":reposname, "msg": e}
+        else:
+            result = _("Create repository '%(repos)s' success.") % {"repos":reposname}
+        return result
+        
     def create(self):
         return render('/repos/create.mako')
 
+
+    def remove_submit(self):
+        try:
+            d = request.params
+            reposname = d.get("repos_list")
+            self.repos.delete(reposname)
+        except Exception, e:
+            result = _("Delete repository '%(repos)s' Failed. Error message:<br>\n%(msg)s") % {
+                        "repos":reposname, "msg": e}
+        else:
+            result = _("Delete blank repository '%(repos)s' success.") % {"repos":reposname}
+        return result
+    
     def remove(self):
         return render('/repos/remove.mako')

trunk/pysvnmanager/model/repos.py

@@ -60 +60 @@
         
     def create(self, repos_name):
+        repos_name = repos_name.strip()
+        assert repos_name != ""
+
         repos_path = "%(root)s/%(entry)s" % { "root": self.repos_root, "entry": repos_name}
         if os.path.exists(repos_path):
@@ -122 +125 @@
             
     def delete(self, repos_name):
+        repos_name = repos_name.strip()
+        assert repos_name != ""
         repos_path = "%(root)s/%(entry)s" % { "root": self.repos_root, "entry": repos_name}
         if os.path.exists(repos_path):
             if self.is_blank_svn_repos(repos_name):
                 from svn import repos as _repos
-                _repos.delete(repos_path)
-            else:
-                raise Exception, _("Repos %s is not a blank repository.") % repos_name
+                return _repos.delete(repos_path)
+        
+        raise Exception, _("Repos %s is not a blank repository.") % repos_name
+        
         
 

trunk/pysvnmanager/templates/repos/hooks.mako

@@ -44 +44 @@
         var name = new Array();
         var total = 0;
-        var revision = '';
         
         repos_list = document.main_form.repos_list;
@@ -55 +54 @@
                         repos_list.options[i] = new Option(name[i], id[i]);
                 }
-                document.main_form.revision.value = revision;
         }
         catch(exception) {
@@ -68 +66 @@
         var name = document.main_form.repos_list.value;
         var params = {select:name};
-        var revision = '';
 
         if (name=='...'||name=='')
@@ -193 +190 @@
 
 <form name="main_form" method="post">
-<input type="hidden" name="revision" value="${c.revision}">
 <DIV style="position:relative;" class=gainlayout>
 
@@ -200 +196 @@
     <select name="repos_list" size="1" onChange='repos_changed()'>
     </select>
-<a href="#" onclick='#'>[+${_("Add repository")}]</a>
-<a href="#" onclick='#'>[-${_("Remove repository")}]</a>
+${h.link_to(_("Add repository"), h.url(action="create"))}
+${h.link_to(_("Remove repository"), h.url(action="remove"))}
+##<a href="#" onclick='#'>[+${_("Add repository")}]</a>
+##<a href="#" onclick='#'>[-${_("Remove repository")}]</a>
 </DIV>
 
@@ -218 +216 @@
             html={'id':'apply_new_hook_form'}, 
             url=h.url(action='apply_new_hook'), 
-            update=dict(success="message", failure="message"), 
+            update="message", 
             method='post', before='apply_new_hook_form_submit(this); showNoticesPopup()',
             complete='hideNoticesPopup();switch_message_box();repos_changed()',
@@ -241 +239 @@
             html={'id':'remove_hook_form'}, 
             url=h.url(action='remove_hook'), 
-            update=dict(success="message", failure="message"), 
+            update="message",
             method='post', before='remove_hook_form_submit(this); showNoticesPopup()',
             complete='hideNoticesPopup();switch_message_box();repos_changed()',

trunk/setup.py

@@ -8 +8 @@
 setup(
     name='pySvnManager',
-    version="0.1.3",
+    version="0.2.0",
     description='SVN authz web management tools.',
     author='Jiang Xin',