kallithea Changeset - 9265958e33bb

Changeset - 9265958e33bb

Parent rev.

Child rev.

[Not reviewed]

codereview

0 5 0

Marcin Kuzminski - 14 years ago 2012-05-17 00:02:52
marcin@python-works.com

Show changes of status inside comments
- comments that change status are now associated with status object, and showed in comments blocks

5 files changed with 31 insertions and 12 deletions:

rhodecode/controllers/changeset.py

rhodecode/model/changeset_status.py

rhodecode/model/db.py

rhodecode/public/css/style.css

rhodecode/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

rhodecode/controllers/changeset.py

➞

Show inline comments

@@ @@ -382,12 +382,13 @@ class ChangesetController(BaseRepoContro @@
         if status and request.POST.get('change_changeset_status'):
             ChangesetStatusModel().set_status(
                 c.rhodecode_db_repo.repo_id,
                 revision,
                 status,
                 c.rhodecode_user.user_id,
                 comm,
+            )
         Session.commit()
         if not request.environ.get('HTTP_X_PARTIAL_XHR'):
             return redirect(h.url('changeset_home', repo_name=repo_name,
                                   revision=revision))

rhodecode/model/changeset_status.py

➞

Show inline comments

@@ @@ -62,33 +62,36 @@ class ChangesetStatusModel(BaseModel): @@
             .filter(ChangesetStatus.repo == repo)\
             .filter(ChangesetStatus.revision == revision).scalar()
         status = status.status if status else status
         st = status or ChangesetStatus.DEFAULT
         return str(st)
     def set_status(self, repo, revision, status, user):
+    def set_status(self, repo, revision, status, user, comment):
         """
         Creates new status for changeset or updates the old one
         :param repo:
         :type repo:
         :param revision:
         :type revision:
         :param status:
         :type status:
         :param user:
         :type user:
         :param comment:
         :type comment:
         """
         repo = self.__get_repo(repo)
         cur_status = ChangesetStatus.query()\
             .filter(ChangesetStatus.repo == repo)\
             .filter(ChangesetStatus.revision == revision)\
             .scalar()
         new_status = cur_status or ChangesetStatus()
         new_status.author = self.__get_user(user)
         new_status.repo = self.__get_repo(repo)
         new_status.status = status
         new_status.revision = revision
         new_status.comment = comment
         self.sa.add(new_status)
         return new_status

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -1208,12 +1208,13 @@ class ChangesetComment(Base, BaseModel): @@
     user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
     text = Column('text', Unicode(25000), nullable=False)
     modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
     author = relationship('User', lazy='joined')
     repo = relationship('Repository')
     status_change = relationship('ChangesetStatus', uselist=False)
     @classmethod
     def get_users(cls, revision):
         """
         Returns user associated with this changesetComment. ie those
         who actually commented
@@ @@ -1244,16 +1245,18 @@ class ChangesetStatus(Base, BaseModel): @@
     changeset_status_id = Column('changeset_status_id', Integer(), nullable=False, primary_key=True)
     repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
     revision = Column('revision', String(40), nullable=False)
     status = Column('status', String(128), nullable=False, default=DEFAULT)
     changeset_comment_id = Column('changeset_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'))
     modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
     author = relationship('User', lazy='joined')
     repo = relationship('Repository')
     comment = relationship('ChangesetComment', lazy='joined')
     @property
     def status_lbl(self):
         return dict(self.STATUSES).get(self.status)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2444,32 +2444,32 @@ h3.files_location { @@
 #content #graph_content .message .issue-tracker-link,
 #changeset_content .container .message .issue-tracker-link{
     color:#3F6F9F;
     font-weight: bold !important;
+}
-.right .changeset-status-container{
 .changeset-status-container{
     padding-right: 5px;
     margin-top:1px;
     float:right;
     height:14px;
+}
 .code-header .changeset-status-container{
 	float:left;
 	padding:2px 0px 0px 2px;
+}
-.right .changeset-status-container .changeset-status-lbl{
 .changeset-status-container .changeset-status-lbl{
 	color: rgb(136, 136, 136);
     float: left;
-    padding: 0px 4px 0px 0px;
+    padding: 3px 4px 0px 0px
+}
 .code-header .changeset-status-container .changeset-status-lbl{
     float: left;
     padding: 0px 4px 0px 0px;
+}
-.right .changeset-status-container .changeset-status-ico{
 .changeset-status-container .changeset-status-ico{
     float: left;
+}
 .code-header .changeset-status-container .changeset-status-ico, .container .changeset-status-ico{
     float: left;
+}
 .right .comments-container{
@@ @@ -3913,23 +3913,28 @@ div.rst-block pre { @@
+}
 .comments .comment .meta {
     background: #f8f8f8;
     padding: 4px;
     border-bottom: 1px solid #ddd;
     height: 18px;
+}
 .comments .comment .meta img {
     vertical-align: middle;
+}
 .comments .comment .meta .user {
     font-weight: bold;
     float: left;
     padding: 4px 2px 2px 2px;
+}
 .comments .comment .meta .date {
 	float: left;
 	padding:4px 4px 0px 4px;
+}
 .comments .comment .text {
     background-color: #FAFAFA;
+}
 .comment .text div.rst-block p {

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -4,23 +4,30 @@ @@
 ## ${comment.comment_block(co)}
 ##
 <%def name="comment_block(co)">
   <div class="comment" id="comment-${co.comment_id}" line="${co.line_no}">
     <div class="comment-wrapp">
   	<div class="meta">
   		<span class="user">
   			<img src="${h.gravatar_url(co.author.email, 20)}" />
         <div style="float:left"> <img src="${h.gravatar_url(co.author.email, 20)}" /> </div>
   		<div class="user">
   			${co.author.username}
   		</span>
   		<span class="date">
   		</div>
   		<div class="date">
   			${h.age(co.modified_at)}
   		</span>
   		</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.status_lbl}</div>
              <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change.status))}" /></div>
            </div>
         %endif
       %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
-        <span class="buttons">
+        <div class="buttons">
           <span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
-        </span>
+        </div>
       %endif
   	</div>
   	<div class="text">
   		${h.rst_w_mentions(co.text)|n}
   	</div>
     </div>

0 comments (0 inline, 0 general)