Changeset 36

Timestamp:

2008年07月31日 01时41分30秒 (4 years ago)

Author:

jiangx

Message:

See #7: admin can rollback to history revision from log page.

Location:

trunk/pysvnmanager

Files:

• controllers/logs.py (modified) (2 diffs)
• i18n/en/LC_MESSAGES/pysvnmanager.po (modified) (4 diffs)
• i18n/pysvnmanager.pot (modified) (4 diffs)
• i18n/zh/LC_MESSAGES/pysvnmanager.po (modified) (4 diffs)
• model/rcsbackup.py (modified) (1 diff)
• templates/logs/view.mako (added)
• tests/functional/test_authz.py (modified) (6 diffs)
• tests/functional/test_check.py (modified) (4 diffs)
• tests/functional/test_role.py (modified) (6 diffs)
• tests/test_rcs_backup.py (modified) (3 diffs)

trunk/pysvnmanager/controllers/logs.py

@@ -69 +69 @@
             'who' : logs[i].get('author',''), 
             'when': logs[i].get('date',''), 
-            'why' : logs[i].get('log',''), 
+            'why' : h.link_to(logs[i].get('log',''), h.url(action='view', id=logs[i].get('revision',''))), 
             }
         
@@ -134 +134 @@
         buff += "<pre>%s</pre>" % self.rcslog.differ(left, right)
         return buff
+
+
+    def view(self, id):
+        assert id and isinstance(id, basestring)
+        c.contents = unicode(self.rcslog.cat(id), 'utf-8')
+        c.log = self.rcslog.get_logs(id, id)[0]
+        return render('/logs/view.mako')
+    
+    def rollback(self, id):
+        msg = _("Rollback to revision: %s" % id)
+        try:
+            assert id and isinstance(id, basestring)
+            self.rcslog.restore(id)
+            self.rcslog.backup(comment=msg, user=self.login_as)
+        except Exception, e:
+            return e
+        else:
+            return msg

trunk/pysvnmanager/i18n/en/LC_MESSAGES/pysvnmanager.po

@@ -10 +10 @@
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2008-07-03 22:14+0800\n"
-"PO-Revision-Date: 2008-07-31 00:22+0800\n"
+"PO-Revision-Date: 2008-07-31 01:18+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -123 +123 @@
 #: pysvnmanager/controllers/logs.py:130
 msgid "Compares between"
+msgstr ""
+
+#: pysvnmanager/controllers/logs.py:145
+#, python-format
+msgid "Rollback to revision: %s"
 msgstr ""
 
@@ -470 +475 @@
 #: pysvnmanager/templates/logs/index.mako:5
 #: pysvnmanager/templates/logs/index.mako:60
+#: pysvnmanager/templates/logs/view.mako:5
 msgid "Administration logs"
 msgstr ""
@@ -475 +481 @@
 #: pysvnmanager/templates/logs/index.mako:66
 msgid "Compare revisions"
+msgstr ""
+
+#: pysvnmanager/templates/logs/view.mako:16
+msgid "View history, revision"
+msgstr ""
+
+#: pysvnmanager/templates/logs/view.mako:23
+msgid "Rollback to this revision"
 msgstr ""
 

trunk/pysvnmanager/i18n/pysvnmanager.pot

@@ -9 +9 @@
 "Project-Id-Version: pySvnManager 0.1.2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2008-07-31 00:22+0800\n"
+"POT-Creation-Date: 2008-07-31 01:18+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -116 +116 @@
 #: pysvnmanager/controllers/logs.py:130
 msgid "Compares between"
+msgstr ""
+
+#: pysvnmanager/controllers/logs.py:145
+#, python-format
+msgid "Rollback to revision: %s"
 msgstr ""
 
@@ -462 +467 @@
 #: pysvnmanager/templates/logs/index.mako:5
 #: pysvnmanager/templates/logs/index.mako:60
+#: pysvnmanager/templates/logs/view.mako:5
 msgid "Administration logs"
 msgstr ""
@@ -467 +473 @@
 #: pysvnmanager/templates/logs/index.mako:66
 msgid "Compare revisions"
+msgstr ""
+
+#: pysvnmanager/templates/logs/view.mako:16
+msgid "View history, revision"
+msgstr ""
+
+#: pysvnmanager/templates/logs/view.mako:23
+msgid "Rollback to this revision"
 msgstr ""
 

trunk/pysvnmanager/i18n/zh/LC_MESSAGES/pysvnmanager.po

@@ -12 +12 @@
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2008-07-03 22:14+0800\n"
-"PO-Revision-Date: 2008-07-31 00:24+0800\n"
+"PO-Revision-Date: 2008-07-31 01:20+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team:  <zh@li.org>\n"
@@ -128 +128 @@
 msgstr "版本间比较"
 
+#: pysvnmanager/controllers/logs.py:145
+#, python-format
+msgid "Rollback to revision: %s"
+msgstr "回滚至版本: %s"
+
 #: pysvnmanager/controllers/role.py:103
 #, python-format
@@ -493 +498 @@
 #: pysvnmanager/templates/logs/index.mako:5
 #: pysvnmanager/templates/logs/index.mako:60
+#: pysvnmanager/templates/logs/view.mako:5
 msgid "Administration logs"
 msgstr "修改记录"
@@ -499 +505 @@
 msgid "Compare revisions"
 msgstr "版本比较"
+
+#: pysvnmanager/templates/logs/view.mako:16
+msgid "View history, revision"
+msgstr "查看历史, 版本"
+
+#: pysvnmanager/templates/logs/view.mako:23
+msgid "Rollback to this revision"
+msgstr "回滚至此版本"
 
 #: pysvnmanager/templates/role/index.mako:5

trunk/pysvnmanager/model/rcsbackup.py

@@ -305 +305 @@
     def differ(self, rev1="", rev2=""):
         return differ(self.__file, rev1, rev2)
-        
+    
+    def restore(self, revision):
+        return restore(self.__file, revision)
+
+    def backup(self, comment='', user=''):
+        return backup(self.__file, comment, user)

trunk/pysvnmanager/tests/functional/test_authz.py

@@ -14 +14 @@
         self.login('nobody')
         res = self.app.get(url_for(controller='authz'))
-        assert res.status == 200
-        assert 'Permission denied.' in res.body, res.body
+        assert res.status == 302
+        self.assertEqual(res.header('location'), '/security/failed', res.header('location'))
         
         # Login as repos admin
@@ -40 +40 @@
         self.login('nobody')
         res = self.app.get(url_for(controller='authz', action='init_repos_list'))
-        assert res.status == 200, res.status
-        self.assert_('Permission denied.' in res.body, res.body)
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
 
         # Login as superuser
@@ -66 +66 @@
         self.login('nobody')
         res = self.app.get(url_for(controller='authz', action='repos_changed'))
-        assert res.status == 200, res.status
-        self.assert_('Permission denied.' in res.body, res.body)
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
 
         # Login as superuser
@@ -107 +107 @@
         self.login('nobody')
         res = self.app.get(url_for(controller='authz', action='path_changed'))
-        assert res.status == 200, res.status
-        self.assert_('Permission denied.' in res.body, res.body)
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
 
         self.login('root')
@@ -153 +153 @@
             self.login('nobody')
             res = self.app.get(url_for(controller='authz', action='save_authz'))
-            assert res.status == 200, res.status
-            self.assert_('Permission denied.' in res.body, res.body)
+            assert res.status == 302, res.status
+            assert res.header('location')== '/security/failed', res.header('location')
             
             # Login as superuser
@@ -316 +316 @@
         res = self.app.get(url_for(controller='authz', action='delete_authz'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        assert res.header('location')== '/security', res.header('location')
 
         # authz test
         self.login('nobody')
         res = self.app.get(url_for(controller='authz', action='delete_authz'))
-        assert res.status == 200, res.status
-        self.assert_('Permission denied.' in res.body, res.body)
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
 
         authz = self.load_authz()

trunk/pysvnmanager/tests/functional/test_check.py

@@ -15 +15 @@
         self.login('nobody')
         res = self.app.get(url_for(controller='check'))
-        assert res.status == 200
-        assert 'Permission denied.' in res.body, res.body
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
         
         # Login as repos admin
@@ -45 +45 @@
         self.login('nobody')
         res = self.app.get(url_for(controller='check', action='access_map'))
-        assert res.status == 200, res.status
-        self.assert_('Permission denied.' in res.body, res.body)
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
         
         # Login as superuser
@@ -206 +206 @@
                   }
         res = self.app.get(url_for(controller='check', action='access_map'), params)
-        assert res.status == 200
-        assert 'Permission denied.' in res.body, res.body
+        assert res.status == 200, res.status
+        assert res.body== 'Permission denied.', res.header('location')
 
     def test_authz_path(self):
@@ -213 +213 @@
         res = self.app.get(url_for(controller='check', action='get_auth_path'))
         assert res.status == 302
-        self.assertEqual(res.header('location'), '/security')
+        assert res.header('location')== '/security', res.header('location')
 
         # authz test
         self.login('nobody')
         res = self.app.get(url_for(controller='check', action='get_auth_path'))
-        assert res.status == 200, res.status
-        self.assert_('Permission denied.' in res.body, res.body)
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
 
         self.login('root')

trunk/pysvnmanager/tests/functional/test_role.py

@@ -15 +15 @@
         self.login('nobody')
         res = self.app.get(url_for(controller='role'))
-        assert res.status == 200
-        assert 'Permission denied.' in res.body, res.body
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
         
         # Permission denied for repos admin(not root admin)
         self.login('admin2')
         res = self.app.get(url_for(controller='role'))
-        assert res.status == 200
-        assert "Permission denied." in res.body, res.body
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
 
         # Login as superuser
@@ -39 +39 @@
         self.login('nobody')
         res = self.app.get(url_for(controller='role', action='get_role_info'))
-        assert res.status == 200, res.status
-        self.assert_('Permission denied.' in res.body, res.body)
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
         
         # Login as superuser
@@ -114 +114 @@
         self.login('nobody')
         res = self.app.get(url_for(controller='role', action='save_group'))
-        assert res.status == 200, res.status
-        self.assert_('Permission denied.' in res.body, res.body)
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
 
         # Change group members, autodrop=no
@@ -198 +198 @@
         self.login('nobody')
         res = self.app.get(url_for(controller='role', action='delete_group'))
-        assert res.status == 200, res.status
-        self.assert_('Permission denied.' in res.body, res.body)
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
 
         # Delete group failed, ref by other group.
@@ -260 +260 @@
         self.login('nobody')
         res = self.app.get(url_for(controller='role', action='save_alias'))
-        assert res.status == 200, res.status
-        self.assert_('Permission denied.' in res.body, res.body)
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
 
         # Change alias successfully
@@ -337 +337 @@
         self.login('nobody')
         res = self.app.get(url_for(controller='role', action='delete_alias'))
-        assert res.status == 200, res.status
-        self.assert_('Permission denied.' in res.body, res.body)
+        assert res.status == 302, res.status
+        assert res.header('location')== '/security/failed', res.header('location')
 
         # Delete alias successfully

trunk/pysvnmanager/tests/test_rcs_backup.py

@@ -176 +176 @@
         assert rcslog.total_page == 2, rcslog.total_page
         rcslog.log_per_page=0
-        assert rcslog.log_per_page==10, rcslog.log_per_page
+        assert rcslog.log_per_page>1, rcslog.log_per_page
         rcslog.log_per_page=5
         assert rcslog.log_per_page==5, rcslog.log_per_page
@@ -189 +189 @@
         logs = rcslog.get_page_logs(2)
         assert [x['revision'] for x in logs] == \
-                ['1.4', '1.5', '1.6', '1.7', '1.8', '1.14'], \
+                ['1.5', '1.6', '1.7', '1.8', '1.9', '1.14'], \
                 [x['revision'] for x in logs]
 
@@ -196 +196 @@
         assert logs == logs2
         assert [x['revision'] for x in logs] == \
-                ['1.1', '1.2', '1.3', '1.14'], \
+                ['1.1', '1.2', '1.3', '1.4', '1.5', '1.14'], \
                 [x['revision'] for x in logs]