Mercurial > kallithea

changeset 4049:3b5f32aeed36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
comments: clarify in ui whether comments are for changeset or PR
author Mads Kiilerich <madski@unity3d.com>
date Wed, 12 Jun 2013 02:13:05 +0200
parents 1e7befa639cc
children fd5d7b17fa72
files rhodecode/model/db.py rhodecode/templates/changeset/changeset_file_comment.html
diffstat 2 files changed, 18 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/model/db.py	Wed Jun 12 02:13:05 2013 +0200
+++ b/rhodecode/model/db.py	Wed Jun 12 02:13:05 2013 +0200
@@ -1979,6 +1979,7 @@
          'mysql_charset': 'utf8'},
     )
 
+    # values for .status
     STATUS_NEW = u'new'
     STATUS_OPEN = u'open'
     STATUS_CLOSED = u'closed'
@@ -1986,7 +1987,7 @@
     pull_request_id = Column('pull_request_id', Integer(), nullable=False, primary_key=True)
     title = Column('title', Unicode(256), nullable=True)
     description = Column('description', UnicodeText(10240), nullable=True)
-    status = Column('status', Unicode(256), nullable=False, default=STATUS_NEW)
+    status = Column('status', Unicode(256), nullable=False, default=STATUS_NEW) # only for closedness, not approve/reject/etc
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     updated_on = Column('updated_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
--- a/rhodecode/templates/changeset/changeset_file_comment.html	Wed Jun 12 02:13:05 2013 +0200
+++ b/rhodecode/templates/changeset/changeset_file_comment.html	Wed Jun 12 02:13:05 2013 +0200
@@ -14,27 +14,35 @@
           <div class="date">
               ${h.age(co.modified_at)}
           </div>
-        %if co.status_change:
-           <div  style="float:left" class="changeset-status-container">
-             <div style="float:left;padding:0px 2px 0px 2px"><span style="font-size: 18px;">&rsaquo;</span></div>
-             <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change[0].status_lbl}</div>
-             <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change[0].status))}" /></div>
-           </div>
-        %endif
 
        <div style="float:left;padding:4px 0px 0px 5px">
         <span class="">
          %if co.pull_request:
             <a href="${h.url('pullrequest_show',repo_name=co.pull_request.other_repo.repo_name,pull_request_id=co.pull_request.pull_request_id)}">
             %if co.status_change:
-              ${_('Status change on pull request #%s') % co.pull_request.pull_request_id}
+              ${_('Status change on pull request #%s') % co.pull_request.pull_request_id}:
             %else:
               ${_('Comment on pull request #%s') % co.pull_request.pull_request_id}
             %endif
             </a>
+         %else:
+            %if co.status_change:
+              ${_('Status change on changeset')}:
+            %else:
+              ${_('Comment on changeset')}
+            %endif
          %endif
         </span>
        </div>
+
+        %if co.status_change:
+           <div  style="float:left" class="changeset-status-container">
+             <div style="float:left;padding:10px 2px 0px 2px"></div>
+             <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change[0].status_lbl}</div>
+             <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change[0].status))}" /></div>
+           </div>
+        %endif
+
       <a class="permalink" href="#comment-${co.comment_id}">&para;</a>
       %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
           <div onClick="deleteComment(${co.comment_id})" class="buttons delete-comment ui-btn small">${_('Delete')}</div>