kallithea Changeset - 79b3c9c66c54

Changeset - 79b3c9c66c54

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 13 years ago 2012-05-25 18:59:15
marcin@python-works.com

Added optional repo_name into issue tracker url to get just the name of repo without group prefix

5 files changed with 16 insertions and 8 deletions:

development.ini

production.ini

rhodecode/config/deployment.ini_tmpl

rhodecode/lib/helpers.py

rhodecode/model/db.py

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -43,12 +43,14 @@ host = 0.0.0.0 @@
 port = 5000
 [app:main]
 use = egg:rhodecode
 full_stack = true
 static_files = true
 # Optional Languages
 # en, fr, pt_BR, zh_CN, zh_TW
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 app_instance_uuid = rc-develop
 cut_off_limit = 256000
 force_https = false
@@ @@ -75,13 +77,14 @@ default_encoding = utf8 @@
 ## default one used here is #<numbers> with a regex passive group for `#`
 ## {id} will be all groups matched from this pattern
 issue_pat = (?:\s*#)(\d+)
 ## server url to the issue, each {id} will be replaced with match
 ## fetched from the regex and {repo} is replaced with repository name
 ## fetched from the regex and {repo} is replaced with full repository name
 ## including groups {repo_name} is replaced with just name of repo
 issue_server_link = https://myissueserver.com/{repo}/issue/{id}
 ## prefix to add to link to indicate it's an url
 ## #314 will be replaced by <issue_prefix><id>

production.ini

➞

Show inline comments

@@ @@ -43,12 +43,14 @@ host = 127.0.0.1 @@
 port = 8001
 [app:main]
 use = egg:rhodecode
 full_stack = true
 static_files = true
 # Optional Languages
 # en, fr, pt_BR, zh_CN, zh_TW
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 app_instance_uuid = rc-production
 cut_off_limit = 256000
 force_https = false
@@ @@ -75,13 +77,14 @@ default_encoding = utf8 @@
 ## default one used here is #<numbers> with a regex passive group for `#`
 ## {id} will be all groups matched from this pattern
 issue_pat = (?:\s*#)(\d+)
 ## server url to the issue, each {id} will be replaced with match
 ## fetched from the regex and {repo} is replaced with repository name
 ## fetched from the regex and {repo} is replaced with full repository name
 ## including groups {repo_name} is replaced with just name of repo
 issue_server_link = https://myissueserver.com/{repo}/issue/{id}
 ## prefix to add to link to indicate it's an url
 ## #314 will be replaced by <issue_prefix><id>

rhodecode/config/deployment.ini_tmpl

➞

Show inline comments

@@ @@ -77,13 +77,14 @@ default_encoding = utf8 @@
 ## default one used here is #<numbers> with a regex passive group for `#`
 ## {id} will be all groups matched from this pattern
 issue_pat = (?:\s*#)(\d+)
 ## server url to the issue, each {id} will be replaced with match
 ## fetched from the regex and {repo} is replaced with repository name
 ## fetched from the regex and {repo} is replaced with full repository name
 ## including groups {repo_name} is replaced with just name of repo
 issue_server_link = https://myissueserver.com/{repo}/issue/{id}
 ## prefix to add to link to indicate it's an url
 ## #314 will be replaced by <issue_prefix><id>

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -41,12 +41,13 @@ from rhodecode.lib.annotate import annot @@
 from rhodecode.lib.utils import repo_name_slug
 from rhodecode.lib.utils2 import str2bool, safe_unicode, safe_str, \
     get_changeset_safe
 from rhodecode.lib.markup_renderer import MarkupRenderer
 from rhodecode.lib.vcs.exceptions import ChangesetDoesNotExistError
 from rhodecode.lib.vcs.backends.base import BaseChangeset
 from rhodecode.model.db import URL_SEP
 log = logging.getLogger(__name__)
 def shorter(text, size=20):
     postfix = '...'
@@ @@ -882,13 +883,12 @@ def urlify_commit(text_, repository=None @@
                 links.append('<a class="message-link" href="%s">%s</a>' % (l, e))
             else:
                 links.append(e)
         return ''.join(links)
     # urlify changesets - extrac revisions and make link out of them
     text_ = urlify_changesets(escaper(text_), repository)
     try:
         conf = config['app_conf']
@@ @@ -909,13 +909,14 @@ def urlify_commit(text_, repository=None @@
                 '%(issue-prefix)s%(id-repr)s'
                 '</a>'
+                )
                 url = ISSUE_SERVER_LNK.replace('{id}', issue_id)
                 if repository:
                     url = url.replace('{repo}', repository)
                     repo_name = repository.split(URL_SEP)[-1]
                     url = url.replace('{repo_name}', repo_name)
                 return tmpl % {
                      'pref': pref,
                      'cls': 'issue-tracker-link',
                      'url': url,
                      'id-repr': issue_id,
                      'issue-prefix': ISSUE_PREFIX,

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -44,13 +44,13 @@ from rhodecode.lib.utils2 import str2boo @@
 from rhodecode.lib.compat import json
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model.meta import Base, Session
 import hashlib
+URL_SEP = '/'
 log = logging.getLogger(__name__)
 #==============================================================================
 # BASE CLASSES
 #==============================================================================
@@ @@ -520,13 +520,13 @@ class Repository(Base, BaseModel): @@
     def __unicode__(self):
         return u"<%s('%s:%s')>" % (self.__class__.__name__,self.repo_id,
                                    self.repo_name)
     @classmethod
     def url_sep(cls):
-        return '/'
+        return URL_SEP
     @classmethod
     def get_by_repo_name(cls, repo_name):
         q = Session.query(cls).filter(cls.repo_name == repo_name)
         q = q.options(joinedload(Repository.fork))\
                 .options(joinedload(Repository.user))\
@@ @@ -773,13 +773,13 @@ class RepoGroup(Base, BaseModel): @@
         repo_groups = sorted(repo_groups, key=lambda t: t[1].split(sep)[0])
         return repo_groups
     @classmethod
     def url_sep(cls):
-        return '/'
+        return URL_SEP
     @classmethod
     def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
         if case_insensitive:
             gr = cls.query()\
                 .filter(cls.group_name.ilike(group_name))

0 comments (0 inline, 0 general)