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

@@ @@ -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.config.conf import DATE_FORMAT, DATETIME_FORMAT
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.db import URL_SEP
 log = logging.getLogger(__name__)
@@ @@ -348,14 +349,14 @@ email = author_email @@
 short_id = lambda x: x[:12]
 hide_credentials = lambda x: ''.join(credentials_filter(x))
 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 ""
 def is_git(repository):
     if hasattr(repository, 'alias'):

rhodecode/model/notification.py

➞

Show inline comments

@@ @@ -29,13 +29,12 @@ import logging @@
 import traceback
 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
 from sqlalchemy.orm import joinedload
 log = logging.getLogger(__name__)
@@ @@ -206,18 +205,18 @@ class NotificationModel(BaseModel): @@
             _n.TYPE_MENTION: _('mentioned you'),
             _n.TYPE_REGISTRATION: _('registered in RhodeCode'),
             _n.TYPE_PULL_REQUEST: _('opened new pull request'),
             _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,
             action=_map[notification.type_], when=when,
+        )
         return tmpl % data

rhodecode/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -51,13 +51,13 @@ @@
             %endfor
             </table>
 	        </div>
 	        <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
 	               %endfor
 	        </div>
 	    </div>
@@ @@ -65,13 +65,14 @@ @@
     </div>
     <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
     <%namespace name="diff_block" file="/changeset/diff_block.html"/>
      %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)}
      %endfor
      <script type="text/javascript">

0 comments (0 inline, 0 general)