Edgewall Software

Changeset 1912

Show
Ignore:
Timestamp:
07/06/2005 11:40:42 AM (3 years ago)
Author:
cboos
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:
3 modified

Legend:

Unmodified
Added
Removed

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

    r1899 r1912  
    112112 
    113113    def _format_link(self, formatter, ns, rev, label, fullmatch=None): 
    114         intertrac = formatter.intertrac_helper(ns, rev, label, fullmatch) 
     114        intertrac = formatter.shorthand_intertrac_helper(ns, rev, label, 
     115                                                         fullmatch) 
    115116        if intertrac: 
    116117            return intertrac 

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

    r1899 r1912  
    156156 
    157157    def _format_link(self, formatter, ns, target, label, fullmatch=None): 
    158         intertrac = formatter.intertrac_helper(ns, target, label, fullmatch) 
     158        intertrac = formatter.shorthand_intertrac_helper(ns, target, label, 
     159                                                         fullmatch) 
    159160        if intertrac: 
    160161            return intertrac 

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

    r1911 r1912  
    255255        elif target[:2] == '//' or ns == "mailto": 
    256256            return self._make_ext_link(ns+':'+target, label) 
    257         elif self.env.siblings.has_key(ns): 
    258             ref = wiki_to_oneliner(target, self.env.siblings[ns]) 
    259             return ref.replace('>%s' % target, '>%s' % label) 
    260257        else: 
    261258            intertrac = self._make_intertrac_link(ns, target, label) 
    … …  
    270267 
    271268    def _make_intertrac_link(self, ns, target, label): 
     269        if self.env.siblings.has_key(ns): 
     270            ref = wiki_to_oneliner(target, self.env.siblings[ns]) 
     271            return ref.replace('>%s' % target, '>%s' % label) 
    272272        url = self.env.config.get('intertrac', ns.upper()+'.url') 
    273273        if url: 
    … …  
    283283            return None 
    284284 
    285     def intertrac_helper(self, ns, target, label, fullmatch): 
     285    def shorthand_intertrac_helper(self, ns, target, label, fullmatch): 
    286286        if fullmatch: # short form 
    287287            alias = fullmatch.group('it_%s' % ns)