Changeset 1912

Timestamp:

Jul 6, 2005, 11:40:42 AM (19 years ago)

Author:

Christian Boos

Message:

InterTrac: fixed support for shorthand InterTrac links so that it works also for sibling environments (r1896 and r1899 did not play well together)

Location:

branches/cboos-dev/intertrac-branch/trac

Files:

• Changeset.py (modified) (1 diff)
• ticket/api.py (modified) (1 diff)
• wiki/formatter.py (modified) (3 diffs)

branches/cboos-dev/intertrac-branch/trac/Changeset.py

@@ -112 +112 @@
 
     def _format_link(self, formatter, ns, rev, label, fullmatch=None):
-        intertrac = formatter.intertrac_helper(ns, rev, label, fullmatch)
+        intertrac = formatter.shorthand_intertrac_helper(ns, rev, label,
+                                                         fullmatch)
         if intertrac:
             return intertrac

branches/cboos-dev/intertrac-branch/trac/ticket/api.py

@@ -156 +156 @@
 
     def _format_link(self, formatter, ns, target, label, fullmatch=None):
-        intertrac = formatter.intertrac_helper(ns, target, label, fullmatch)
+        intertrac = formatter.shorthand_intertrac_helper(ns, target, label,
+                                                         fullmatch)
         if intertrac:
             return intertrac

branches/cboos-dev/intertrac-branch/trac/wiki/formatter.py

@@ -255 +255 @@
         elif target[:2] == '//' or ns == "mailto":
             return self._make_ext_link(ns+':'+target, label)
-        elif self.env.siblings.has_key(ns):
-            ref = wiki_to_oneliner(target, self.env.siblings[ns])
-            return ref.replace('>%s' % target, '>%s' % label)
         else:
             intertrac = self._make_intertrac_link(ns, target, label)
@@ -270 +267 @@
 
     def _make_intertrac_link(self, ns, target, label):
+        if self.env.siblings.has_key(ns):
+            ref = wiki_to_oneliner(target, self.env.siblings[ns])
+            return ref.replace('>%s' % target, '>%s' % label)
         url = self.env.config.get('intertrac', ns.upper()+'.url')
         if url:
@@ -283 +283 @@
             return None
 
-    def intertrac_helper(self, ns, target, label, fullmatch):
+    def shorthand_intertrac_helper(self, ns, target, label, fullmatch):
         if fullmatch: # short form
             alias = fullmatch.group('it_%s' % ns)