# HG changeset patch # User Mads Kiilerich # Date 1370995985 -7200 # Node ID 3b5f32aeed3646a842843bded357354e479dbdb2 # Parent 1e7befa639cc4e690a5b81ed54ec73506c75f53c comments: clarify in ui whether comments are for changeset or PR diff -r 1e7befa639cc -r 3b5f32aeed36 rhodecode/model/db.py --- 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) diff -r 1e7befa639cc -r 3b5f32aeed36 rhodecode/templates/changeset/changeset_file_comment.html --- 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 @@
${h.age(co.modified_at)}
- %if co.status_change: -
-
›
-
${co.status_change[0].status_lbl}
-
-
- %endif
%if co.pull_request: %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 + %else: + %if co.status_change: + ${_('Status change on changeset')}: + %else: + ${_('Comment on changeset')} + %endif %endif
+ + %if co.status_change: +
+
+
${co.status_change[0].status_lbl}
+
+
+ %endif + %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
${_('Delete')}