kallithea Changeset - 76947224bf27

Changeset - 76947224bf27

Parent rev.

Child rev.

[Not reviewed]

codereview

0 9 0

Marcin Kuzminski - 14 years ago 2012-05-01 22:24:41
marcin@python-works.com

Implemented initial code-review status of changesets

9 files changed with 128 insertions and 17 deletions:

rhodecode/controllers/changeset.py

rhodecode/lib/helpers.py

rhodecode/model/changeset_status.py

rhodecode/model/db.py

rhodecode/model/notification.py

rhodecode/public/css/style.css

rhodecode/templates/changelog/changelog.html

rhodecode/templates/changeset/changeset.html

rhodecode/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

rhodecode/controllers/changeset.py

➞

Show inline comments

@@ @@ -34,25 +34,25 @@ from pylons.controllers.util import redi @@
 from pylons.decorators import jsonify
 from rhodecode.lib.vcs.exceptions import RepositoryError, ChangesetError, \
     ChangesetDoesNotExistError
 from rhodecode.lib.vcs.nodes import FileNode
 import rhodecode.lib.helpers as h
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import EmptyChangeset
 from rhodecode.lib.compat import OrderedDict
 from rhodecode.lib import diffs
 from rhodecode.model.db import ChangesetComment
+from rhodecode.model.db import ChangesetComment, ChangesetStatus
 from rhodecode.model.comment import ChangesetCommentsModel
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.meta import Session
 from rhodecode.lib.diffs import wrapped_diff
 log = logging.getLogger(__name__)
 def _update_with_GET(params, GET):
     for k in ['diff1', 'diff2', 'diff']:
         params[k] += GET.getall(k)
@@ @@ -193,35 +193,35 @@ class ChangesetController(BaseRepoContro @@
         except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
             log.error(traceback.format_exc())
             h.flash(str(e), category='warning')
             return redirect(url('home'))
         c.changes = OrderedDict()
         c.lines_added = 0  # count of lines added
         c.lines_deleted = 0  # count of lines removes
         cumulative_diff = 0
         c.cut_off = False  # defines if cut off limit is reached
+        c.changeset_statuses = ChangesetStatus.STATUSES
         c.comments = []
         c.statuses = []
         c.inline_comments = []
         c.inline_cnt = 0
         # Iterate over ranges (default changeset view is always one changeset)
         for changeset in c.cs_ranges:
             c.statuses.extend(ChangesetStatusModel()\
+            c.statuses.extend([ChangesetStatusModel()\
                               .get_status(c.rhodecode_db_repo.repo_id,
                                           changeset.raw_id))
+                                          changeset.raw_id)])
             c.comments.extend(ChangesetCommentsModel()\
                               .get_comments(c.rhodecode_db_repo.repo_id,
                                             changeset.raw_id))
             inlines = ChangesetCommentsModel()\
                         .get_inline_comments(c.rhodecode_db_repo.repo_id,
                                              changeset.raw_id)
             c.inline_comments.extend(inlines)
             c.changes[changeset.raw_id] = []
             try:
                 changeset_parent = changeset.parents[0]
             except IndexError:
@@ @@ -367,24 +367,35 @@ class ChangesetController(BaseRepoContro @@
         return render('changeset/raw_changeset.html')
     @jsonify
     def comment(self, repo_name, revision):
         comm = ChangesetCommentsModel().create(
             text=request.POST.get('text'),
             repo_id=c.rhodecode_db_repo.repo_id,
             user_id=c.rhodecode_user.user_id,
             revision=revision,
             f_path=request.POST.get('f_path'),
             line_no=request.POST.get('line')
+        )
         # get status if set !
         status = request.POST.get('changeset_status')
         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,
+            )
         Session.commit()
         if not request.environ.get('HTTP_X_PARTIAL_XHR'):
             return redirect(h.url('changeset_home', repo_name=repo_name,
                                   revision=revision))
         data = {
            'target_id': h.safeid(h.safe_unicode(request.POST.get('f_path'))),
+        }
         if comm:
             c.co = comm
             data.update(comm.get_dict())
             data.update({'rendered_text':

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -33,24 +33,25 @@ from webhelpers.text import chop_at, col @@
     convert_misc_entities, lchop, plural, rchop, remove_formatting, \
     replace_whitespace, urlify, truncate, wrap_paragraphs
 from webhelpers.date import time_ago_in_words
 from webhelpers.paginate import Page
 from webhelpers.html.tags import _set_input_attrs, _set_id_attr, \
     convert_boolean_attrs, NotGiven, _make_safe_id_component
 from rhodecode.lib.annotate import annotate_highlight
 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.model.changeset_status import ChangesetStatusModel
 log = logging.getLogger(__name__)
 def shorter(text, size=20):
     postfix = '...'
     if len(text) > size:
         return text[:size - len(postfix)] + postfix
     return text
 def _reset(name, value=None, id=NotGiven, type="reset", **attrs):
@@ @@ -866,25 +867,24 @@ def urlify_commit(text_, repository=None @@
     def linkify_others(t, l):
         urls = re.compile(r'(\<a.*?\<\/a\>)',)
         links = []
         for e in urls.split(t):
             if not urls.match(e):
                 links.append('<a class="message-link" href="%s">%s</a>' % (l, e))
             else:
                 links.append(e)
         return ''.join(links)
     # urlify changesets - extrac revisions and make link out of them
     text_ = urlify_changesets(escaper(text_), repository)
     try:
         conf = config['app_conf']
         URL_PAT = re.compile(r'%s' % conf.get('issue_pat'))
         if URL_PAT:
             ISSUE_SERVER_LNK = conf.get('issue_server_link')
             ISSUE_PREFIX = conf.get('issue_prefix')
@@ @@ -930,12 +930,16 @@ def rst(source): @@
     return literal('<div class="rst-block">%s</div>' %
                    MarkupRenderer.rst(source))
 def rst_w_mentions(source):
     """
     Wrapped rst renderer with @mention highlighting
     :param source:
     """
     return literal('<div class="rst-block">%s</div>' %
                    MarkupRenderer.rst_with_mentions(source))
 def changeset_status(repo, revision):
     return ChangesetStatusModel().get_status(repo, revision)

rhodecode/model/changeset_status.py

➞

Show inline comments

@@ @@ -20,26 +20,75 @@ @@
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 import traceback
 from pylons.i18n.translation import _
 from rhodecode.lib.utils2 import safe_unicode
 from rhodecode.lib import helpers as h
 from rhodecode.model import BaseModel
 from rhodecode.model.db import ChangesetStatus
+from rhodecode.model.db import ChangesetStatus, Repository, User
 log = logging.getLogger(__name__)
 class ChangesetStatusModel(BaseModel):
     def __get_changeset_status(self, changeset_status):
         return self._get_instance(ChangesetStatus, changeset_status)
     def __get_repo(self, repository):
         return self._get_instance(Repository, repository,
                                   callback=Repository.get_by_repo_name)
     def __get_user(self, user):
         return self._get_instance(User, user, callback=User.get_by_username)
     def get_status(self, repo, revision):
         return 'status'
         """
         Returns status of changeset for given revision
         :param repo:
         :type repo:
         :param revision: 40char hash
         :type revision: str
         """
         repo = self.__get_repo(repo)
         status = ChangesetStatus.query()\
             .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):
         """
         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:
         """
         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
         self.sa.add(new_status)
         return new_status

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -671,38 +671,38 @@ class Repository(Base, BaseModel): @@
         cmts = ChangesetComment.query()\
             .filter(ChangesetComment.repo == self)
         if revisions:
             cmts = cmts.filter(ChangesetComment.revision.in_(revisions))
         grouped = defaultdict(list)
         for cmt in cmts.all():
             grouped[cmt.revision].append(cmt)
         return grouped
     def statuses(self, revisions=None):
         """
         Returns statuses for this repository
         :param revisions: list of revisions to get statuses for
         :type revisions: list
         """
         statuses = ChangesetStatus.query()\
             .filter(ChangesetStatus.repo == self)
         if revisions:
             statuses = statuses.filter(ChangesetStatus.revision.in_(revisions))
-        grouped = defaultdict(list)
+        grouped = {}
         for stat in statuses.all():
-            grouped[statuses.revision].append(stat)
+            grouped[stat.revision] = [str(stat.status), stat.status_lbl]
         return grouped
     #==========================================================================
     # SCM CACHE INSTANCE
     #==========================================================================
     @property
     def invalidate(self):
         return CacheInvalidation.invalidate(self.repo_name)
     def set_invalidate(self):
         """
         set a cache for invalidation for this instance
         """
@@ @@ -1220,45 +1220,51 @@ class ChangesetComment(Base, BaseModel): @@
         :param cls:
         :param revision:
         """
         return Session.query(User)\
                 .filter(cls.revision == revision)\
                 .join(ChangesetComment.author).all()
 class ChangesetStatus(Base, BaseModel):
     __tablename__ = 'changeset_statuses'
     __table_args__ = (
         UniqueConstraint('repo_id', 'revision'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
+    )
     STATUSES = [
         ('not_reviewed', _("Not Reviewed")),  # (no icon) and default
         ('approved', _("Approved")),
         ('rejected', _("Rejected")),
         ('under_review', _("Under Review")),
+    ]
     DEFAULT = STATUSES[0][0]
     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=STATUSES[0][0])
+    status = Column('status', String(128), nullable=False, default=DEFAULT)
     modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
     author = relationship('User', lazy='joined')
     repo = relationship('Repository')
     @property
     def status_lbl(self):
         return dict(self.STATUSES).get(self.status)
 class ChangesetStatusHistory(Base, BaseModel):
     __tablename__ = 'changeset_statuses_history'
     __table_args__ = (
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8'}
+    )
     #TODO: check if sqla has a nice history table implementation
     changeset_status_id = Column('changeset_status_id', Integer(), ForeignKey('changeset_statuses.changeset_status_id'), nullable=False, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
     status = Column('status', String(128), nullable=False)
     modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)

rhodecode/model/notification.py

➞

Show inline comments

@@ @@ -133,25 +133,25 @@ class NotificationModel(BaseModel): @@
                 return True
         except Exception:
             log.error(traceback.format_exc())
             raise
     def get_for_user(self, user):
         user = self.__get_user(user)
         return user.notifications
     def mark_all_read_for_user(self, user):
         user = self.__get_user(user)
         UserNotification.query()\
             .filter(UserNotification.read==False)\
+            .filter(UserNotification.read == False)\
             .update({'read': True})
     def get_unread_cnt_for_user(self, user):
         user = self.__get_user(user)
         return UserNotification.query()\
                 .filter(UserNotification.read == False)\
                 .filter(UserNotification.user == user).count()
     def get_unread_for_user(self, user):
         user = self.__get_user(user)
         return [x.notification for x in UserNotification.query()\
                 .filter(UserNotification.read == False)\

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -2438,24 +2438,35 @@ h3.files_location { @@
 #changeset_content .container .message .revision-link
+ {
 	color:#3F6F9F;
     font-weight: bold !important;
+}
 #content #graph_content .message .issue-tracker-link,
 #changeset_content .container .message .issue-tracker-link{
     color:#3F6F9F;
     font-weight: bold !important;
+}
 .right .changeset-status-container{
     padding-right: 5px;
     margin-top:1px;
     float:right;
     height:14px;
+}
 .right .changeset-status-container .changeset-status-lbl{
 	color: rgb(136, 136, 136);
     float: left;
     padding: 0px 4px 0px 0px;
+}
 .right .comments-container{
 	padding-right: 5px;
 	margin-top:1px;
 	float:right;
 	height:14px;
+}
 .right .comments-cnt{
     float: left;
     color: rgb(136, 136, 136);
     padding-right: 2px;
+}
@@ @@ -3899,24 +3910,29 @@ div.rst-block pre { @@
 	margin: 0.5em 0px !important;
+}
 .comments .comments-number{
 	padding:0px 0px 10px 0px;
 	font-weight: bold;
 	color: #666;
 	font-size: 16px;
+}
 /** comment form **/
 .status-block{
     height:80px;
     clear:both
+}
 .comment-form .clearfix{
 	background: #EEE;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     padding: 10px;
+}
 div.comment-form {
     margin-top: 20px;
+}

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -56,35 +56,40 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
 								</div>
 								<div title="${cs.author}" class="user">${h.person(cs.author)}</div>
 							</div>
                             <div class="date">${cs.date}</div>
 						</div>
 						<div class="mid">
                             <div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
                             <div class="expand"><span class="expandtext">&darr; ${_('show more')} &darr;</span></div>
 						</div>
 						<div class="right">
 									<div id="${cs.raw_id}_changes_info" class="changes">
                                         <div id="${cs.raw_id}"  style="float:right;" class="changed_total tooltip" title="${_('Affected number of files, click to show more details')}">${len(cs.affected_files)}</div>
                                         <div class="changeset-status-container">${c.statuses.get(cs.raw_id)}</div>
                                         <div class="comments-container">
                                         %if len(c.comments.get(cs.raw_id,[])) > 0:
                                             <div class="comments-cnt" title="${('comments')}">
                                               <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
                                                <div class="comments-cnt">${len(c.comments[cs.raw_id])}</div>
                                                <img src="${h.url('/images/icons/comments.png')}">
                                               </a>
                                             </div>
                                         %endif
                                         </div>
                                         <div class="changeset-status-container">
                                             %if c.statuses.get(cs.raw_id):
                                               <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
                                               <div class="changeset-status-lbl">${c.statuses.get(cs.raw_id)[1]}</div>
                                             %endif
                                         </div>
 									</div>
 								   %if cs.parents:
 									%for p_cs in reversed(cs.parents):
 										<div class="parent">${_('Parent')}
 											<span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id),
 											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span>
 										</div>
 									%endfor
 								   %else:
                                         <div class="parent">${_('No parents')}</div>
                                    %endif

rhodecode/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -31,25 +31,25 @@ @@
                  r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
                 </div>
                 <div class="date">
                   ${c.changeset.date}
                 </div>
                 <div class="diff-actions">
                   <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show')}" title="${_('raw diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
                   <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" title="${_('download diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a>
                   ${c.ignorews_url(request.GET)}
                   ${c.context_url(request.GET)}
                 </div>
                 <div class="comments-number" style="float:right;padding-right:5px">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>
-			</div>
+            </div>
 		</div>
 	    <div id="changeset_content">
 			<div class="container">
 	             <div class="left">
 	                 <div class="author">
 	                     <div class="gravatar">
 	                         <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),20)}"/>
 	                     </div>
 	                     <span>${h.person(c.changeset.author)}</span><br/>
 	                     <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/>
 	                 </div>
 	                 <div class="message">${h.urlify_commit(h.wrap_paragraphs(c.changeset.message),c.repo_name)}</div>
@@ @@ -144,18 +144,27 @@ @@
                   YUD.setStyle(btns[c],'display',show);
+               }
           })
           YUE.on(YUQ('.line'),'click',function(e){
               var tr = e.currentTarget;
               injectInlineForm(tr);
           });
           // inject comments into they proper positions
           var file_comments = YUQ('.inline-comment-placeholder');
           renderInlineComments(file_comments);
           YUE.on(YUD.get('show_changeset_status_box'),'change',function(e){
         	  if(e.currentTarget.checked){
         		  YUD.setStyle('status_block_container','display','');
+        	  }
         	  else{
         		  YUD.setStyle('status_block_container','display','none');
+        	  }
           })
       })
     </script>
     </div>
 </%def>

rhodecode/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -29,25 +29,25 @@ @@
 <%def name="comment_inline_form(changeset)">
 <div id='comment-inline-form-template' style="display:none">
   <div class="comment-inline-form">
   %if c.rhodecode_user.username != 'default':
     <div class="overlay"><div class="overlay-text">${_('Submitting...')}</div></div>
       ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id),class_='inline-form')}
       <div class="clearfix">
           <div class="comment-help">${_('Commenting on line')} {1}. ${_('Comments parsed using')}
           <a href="${h.url('rst_help')}">RST</a> ${_('syntax')} ${_('with')}
           <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
           </div>
+          </div>
           <textarea id="text_{1}" name="text"></textarea>
       </div>
       <div class="comment-button">
       <input type="hidden" name="f_path" value="{0}">
       <input type="hidden" name="line" value="{1}">
       ${h.submit('save', _('Comment'), class_='ui-btn save-inline-form')}
       ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
       </div>
       ${h.end_form()}
   %else:
       ${h.form('')}
       <div class="clearfix">
@@ @@ -70,43 +70,54 @@ @@
     %for path, lines in c.inline_comments:
         % for line,comments in lines.iteritems():
             <div style="display:none" class="inline-comment-placeholder" path="${path}" target_id="${h.safeid(h.safe_unicode(path))}">
             %for co in comments:
                 ${comment_block(co)}
             %endfor
             </div>
         %endfor
     %endfor
 </%def>
 ## MAIN COMMENT FORM
 <%def name="comments(changeset)">
 <div class="comments">
     <div id="inline-comments-container">
      ${inlines(changeset)}
     </div>
     %for co in c.comments:
         <div id="comment-tr-${co.comment_id}">
           ${comment_block(co)}
         </div>
     %endfor
     %if c.rhodecode_user.username != 'default':
     <div class="comment-form">
         ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))}
         <strong>${_('Leave a comment')}</strong>
         <div class="clearfix">
             <div class="comment-help">
                 ${_('Comments parsed using')} <a href="${h.url('rst_help')}">RST</a> ${_('syntax')}
                 ${_('with')} <span style="color:#003367" class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> ${_('support')}
                 | <span class="tooltip" title="${_('Check this to change current status of code-review for this changeset')}"> ${_('change status')}
                   <input style="vertical-align: bottom;margin-bottom:-2px" id="show_changeset_status_box" type="checkbox" name="change_changeset_status" />
                   </span>
             </div>
                 ${h.textarea('text')}
             <div id="status_block_container" class="status-block" style="display:none">
                 %for status,lbl in c.changeset_statuses:
                     <div class="">
                         <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == h.changeset_status(c.rhodecode_db_repo, c.changeset.raw_id) else ''}" type="radio" name="changeset_status" value="${status}"> <label>${lbl}</label>
                     </div>
                 %endfor
             </div>
             ${h.textarea('text')}
         </div>
         <div class="comment-button">
         ${h.submit('save', _('Comment'), class_='ui-button')}
         </div>
         ${h.end_form()}
     </div>
     %endif
 </div>
 </%def>

0 comments (0 inline, 0 general)