kallithea Changeset - 4753a3445ff7

Changeset - 4753a3445ff7

Parent rev.

Child rev.

[Not reviewed]

Merge codereview

0 3 0

Marcin Kuzminski - 13 years ago 2012-06-11 23:28:22
marcin@python-works.com

merge with beta

3 files changed with 9 insertions and 8 deletions:

rhodecode/lib/helpers.py

rhodecode/model/notification.py

rhodecode/templates/changeset/changeset_range.html

0 comments (0 inline, 0 general)

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -44,6 +44,7 @@ from rhodecode.lib.utils2 import str2boo @@
 from rhodecode.lib.markup_renderer import MarkupRenderer
 from rhodecode.lib.vcs.exceptions import ChangesetDoesNotExistError
 from rhodecode.lib.vcs.backends.base import BaseChangeset
 from rhodecode.config.conf import DATE_FORMAT, DATETIME_FORMAT
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.db import URL_SEP
@@ @@ -351,8 +352,8 @@ hide_credentials = lambda x: ''.join(cre @@
 def fmt_date(date):
     if date:
         return (date.strftime(_(u"%a, %d %b %Y %H:%M:%S").encode('utf8'))
             .decode('utf8'))
         _fmt = _(u"%a, %d %b %Y %H:%M:%S").encode('utf8')
         return date.strftime(_fmt).decode('utf8')
     return ""

rhodecode/model/notification.py

➞

Show inline comments

@@ @@ -32,7 +32,6 @@ import datetime @@
 from pylons.i18n.translation import _
 import rhodecode
 from rhodecode.config.conf import DATETIME_FORMAT
 from rhodecode.lib import helpers as h
 from rhodecode.model import BaseModel
 from rhodecode.model.db import Notification, User, UserNotification
@@ @@ -209,12 +208,12 @@ class NotificationModel(BaseModel): @@
             _n.TYPE_PULL_REQUEST_COMMENT: _('commented on pull request')
+        }
         tmpl = "%(user)s %(action)s %(when)s"
         # action == _map string
         tmpl = "%(user)s %(action)s at %(when)s"
         if show_age:
             when = h.age(notification.created_on)
         else:
             DTF = lambda d: datetime.datetime.strftime(d, DATETIME_FORMAT)
             when = DTF(notification.created_on)
             when = h.fmt_date(notification.created_on)
         data = dict(
             user=notification.created_by_user.username,

rhodecode/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -54,7 +54,7 @@ @@
 	        <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>
 	        <div class="cs_files">
 	               %for cs in c.cs_ranges:
-	                   <div class="cur_cs">r${cs}</div>
+	                   <div class="cur_cs">${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
 	                %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]:
 	                    <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID(cs.raw_id,filenode.path)))}</div>
 	                %endfor
@@ @@ -68,7 +68,8 @@ @@
      %for cs in c.cs_ranges:
           ##${comment.comment_inline_form(cs)}
           ## diff block
           <h3 style="border:none;padding-top:8px;">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</h3>
           <h3 style="padding-top:8px;">${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</h3>
           ${diff_block.diff_block(c.changes[cs.raw_id])}
           ##${comment.comments(cs)}

0 comments (0 inline, 0 general)