Changeset 14888

Timestamp:

Aug 22, 2015, 9:41:34 PM (9 years ago)

Author:

Ryan J Ollos

Message:

1.0.0dev: Redirect didn't account for base URL. Fixes #12474.

Unsupported operands error with repository containing integer revisions. Refs ​trac:#12179.

Both patches by Jun Omae.

Location:

codereviewerplugin/1.0/coderev

Files:

• tests/__init__.py (modified) (2 diffs)
• tests/model.py (added)
• tests/web_ui.py (added)
• web_ui.py (modified) (5 diffs)

codereviewerplugin/1.0/coderev/tests/__init__.py

@@ -10 +10 @@
 import unittest
 
-from coderev.tests import api
+from coderev.tests import api, model, web_ui
 
 
@@ -16 +16 @@
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(api.suite))
+    suite.addTest(unittest.makeSuite(model.suite))
+    suite.addTest(unittest.makeSuite(web_ui.suite))
     return suite
 

codereviewerplugin/1.0/coderev/web_ui.py

@@ -21 +21 @@
 from trac.web.chrome import (ITemplateProvider, add_script, add_script_data,
     add_stylesheet, pretty_timedelta, web_context)
-from trac.web.href import Href
 from trac.web.main import IRequestFilter
 from trac.wiki.formatter import format_to_html
@@ -30 +29 @@
 from model import CodeReview
 from api import is_incomplete
+
 
 class CodeReviewerModule(Component):
@@ -77 +77 @@
                 if review.save(req.authname, req.args['status'],
                                req.args['summary']):
-                    self._update_tickets(review, status_changed)
+                    self._update_tickets(changeset, review, status_changed)
                     tickets = review.tickets
-                href = Href(req.path_info)
-                req.redirect(href(tickets=tickets))
+                req.redirect(req.href(req.path_info, tickets=tickets))
             ctx = web_context(req)
             format_summary = functools.partial(format_to_html, self.env, ctx,
@@ -113 +112 @@
     # Private methods
 
-    def _update_tickets(self, review, status_changed):
+    def _update_tickets(self, changeset, review, status_changed):
         """Updates the tickets referenced by the given review's changeset
         with a comment of field changes.  Field changes and command execution
@@ -127 +126 @@
             else:
                 comment = "Code review comment"
-            repos = RepositoryManager(self.env).get_repository(review.repo)
+            repos = changeset.repos
             ref = review.changeset
-            disp_ref = repos.short_rev(review.changeset)
+            disp_ref = str(repos.short_rev(review.changeset))
             if review.repo:
                 ref += '/' + review.repo