Changeset - ad19dfcdb1cc
Parent rev.
Child rev.
[Not reviewed]
codereview
0 4 0
Marcin Kuzminski - 13 years ago 2012-06-10 16:44:06
marcin@python-works.com
Refactoring of changeset_file_comments for more generic usage. In both It enables sharing code between changeset, and pull requests discussions
4 files changed with 56 insertions and 26 deletions:
rhodecode/controllers/changeset.py
3
3
rhodecode/model/comment.py
31
8
rhodecode/templates/changeset/changeset.html
4
10
rhodecode/templates/changeset/changeset_file_comment.html
18
5
0 comments (0 inline, 0 general)
rhodecode/controllers/changeset.py
➞
Show inline comments
 
@@ -175,172 +175,172 @@ class ChangesetController(BaseRepoContro
 

			




	
	
	
		
 
        c.anchor_url = anchor_url

			




	
	
	
		
 
        c.ignorews_url = _ignorews_url

			




	
	
	
		
 
        c.context_url = _context_url

			




	
	
	
		
 
        limit_off = request.GET.get('fulldiff')

			




	
	
	
		
 
        #get ranges of revisions if preset

			




	
	
	
		
 
        rev_range = revision.split('...')[:2]

			




	
	
	
		
 
        enable_comments = True

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            if len(rev_range) == 2:

			




	
	
	
		
 
                enable_comments = False

			




	
	
	
		
 
                rev_start = rev_range[0]

			




	
	
	
		
 
                rev_end = rev_range[1]

			




	
	
	
		
 
                rev_ranges = c.rhodecode_repo.get_changesets(start=rev_start,

			




	
	
	
		
 
                                                            end=rev_end)

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                rev_ranges = [c.rhodecode_repo.get_changeset(revision)]

			




	
	
	
		
 

			




	
	
	
		
 
            c.cs_ranges = list(rev_ranges)

			




	
	
	
		
 
            if not c.cs_ranges:

			




	
	
	
		
 
                raise RepositoryError('Changeset range returned empty result')

			




	
	
	
		
 

			




	
	
	
		
 
        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()\

			




	
	
	
		
 
                              .get_status(c.rhodecode_db_repo.repo_id,

			




	
	
	
		
 
                                          changeset.raw_id)])

			




	
	
	
		
 

			




	
	
	
		
 
            c.comments.extend(ChangesetCommentsModel()\

			




	
	
	
		
 
                              .get_comments(c.rhodecode_db_repo.repo_id,

			




	
	
	
		
 
                                            changeset.raw_id))

			




	
	
	
		
 
                                            revision=changeset.raw_id))

			




	
	
	
		
 
            inlines = ChangesetCommentsModel()\

			




	
	
	
		
 
                        .get_inline_comments(c.rhodecode_db_repo.repo_id,

			




	
	
	
		
 
                                             changeset.raw_id)

			




	
	
	
		
 
                                             revision=changeset.raw_id)

			




	
	
	
		
 
            c.inline_comments.extend(inlines)

			




	
	
	
		
 
            c.changes[changeset.raw_id] = []

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                changeset_parent = changeset.parents[0]

			




	
	
	
		
 
            except IndexError:

			




	
	
	
		
 
                changeset_parent = None

			




	
	
	
		
 

			




	
	
	
		
 
            #==================================================================

			




	
	
	
		
 
            # ADDED FILES

			




	
	
	
		
 
            #==================================================================

			




	
	
	
		
 
            for node in changeset.added:

			




	
	
	
		
 
                fid = h.FID(revision, node.path)

			




	
	
	
		
 
                line_context_lcl = get_line_ctx(fid, request.GET)

			




	
	
	
		
 
                ign_whitespace_lcl = get_ignore_ws(fid, request.GET)

			




	
	
	
		
 
                lim = self.cut_off_limit

			




	
	
	
		
 
                if cumulative_diff > self.cut_off_limit:

			




	
	
	
		
 
                    lim = -1 if limit_off is None else None

			




	
	
	
		
 
                size, cs1, cs2, diff, st = wrapped_diff(

			




	
	
	
		
 
                    filenode_old=None,

			




	
	
	
		
 
                    filenode_new=node,

			




	
	
	
		
 
                    cut_off_limit=lim,

			




	
	
	
		
 
                    ignore_whitespace=ign_whitespace_lcl,

			




	
	
	
		
 
                    line_context=line_context_lcl,

			




	
	
	
		
 
                    enable_comments=enable_comments

			




	
	
	
		
 
                )

			




	
	
	
		
 
                cumulative_diff += size

			




	
	
	
		
 
                c.lines_added += st[0]

			




	
	
	
		
 
                c.lines_deleted += st[1]

			




	
	
	
		
 
                c.changes[changeset.raw_id].append(

			




	
	
	
		
 
                    ('added', node, diff, cs1, cs2, st)

			




	
	
	
		
 
                )

			




	
	
	
		
 

			




	
	
	
		
 
            #==================================================================

			




	
	
	
		
 
            # CHANGED FILES

			




	
	
	
		
 
            #==================================================================

			




	
	
	
		
 
            for node in changeset.changed:

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    filenode_old = changeset_parent.get_node(node.path)

			




	
	
	
		
 
                except ChangesetError:

			




	
	
	
		
 
                    log.warning('Unable to fetch parent node for diff')

			




	
	
	
		
 
                    filenode_old = FileNode(node.path, '', EmptyChangeset())

			




	
	
	
		
 

			




	
	
	
		
 
                fid = h.FID(revision, node.path)

			




	
	
	
		
 
                line_context_lcl = get_line_ctx(fid, request.GET)

			




	
	
	
		
 
                ign_whitespace_lcl = get_ignore_ws(fid, request.GET)

			




	
	
	
		
 
                lim = self.cut_off_limit

			




	
	
	
		
 
                if cumulative_diff > self.cut_off_limit:

			




	
	
	
		
 
                    lim = -1 if limit_off is None else None

			




	
	
	
		
 
                size, cs1, cs2, diff, st = wrapped_diff(

			




	
	
	
		
 
                    filenode_old=filenode_old,

			




	
	
	
		
 
                    filenode_new=node,

			




	
	
	
		
 
                    cut_off_limit=lim,

			




	
	
	
		
 
                    ignore_whitespace=ign_whitespace_lcl,

			




	
	
	
		
 
                    line_context=line_context_lcl,

			




	
	
	
		
 
                    enable_comments=enable_comments

			




	
	
	
		
 
                )

			




	
	
	
		
 
                cumulative_diff += size

			




	
	
	
		
 
                c.lines_added += st[0]

			




	
	
	
		
 
                c.lines_deleted += st[1]

			




	
	
	
		
 
                c.changes[changeset.raw_id].append(

			




	
	
	
		
 
                    ('changed', node, diff, cs1, cs2, st)

			




	
	
	
		
 
                )

			




	
	
	
		
 
            #==================================================================

			




	
	
	
		
 
            # REMOVED FILES

			




	
	
	
		
 
            #==================================================================

			




	
	
	
		
 
            for node in changeset.removed:

			




	
	
	
		
 
                c.changes[changeset.raw_id].append(

			




	
	
	
		
 
                    ('removed', node, None, None, None, (0, 0))

			




	
	
	
		
 
                )

			




	
	
	
		
 

			




	
	
	
		
 
        # count inline comments

			




	
	
	
		
 
        for path, lines in c.inline_comments:

			




	
	
	
		
 
        for _, lines in c.inline_comments:

			




	
	
	
		
 
            for comments in lines.values():

			




	
	
	
		
 
                c.inline_cnt += len(comments)

			




	
	
	
		
 

			




	
	
	
		
 
        if len(c.cs_ranges) == 1:

			




	
	
	
		
 
            c.changeset = c.cs_ranges[0]

			




	
	
	
		
 
            c.changes = c.changes[c.changeset.raw_id]

			




	
	
	
		
 

			




	
	
	
		
 
            return render('changeset/changeset.html')

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            return render('changeset/changeset_range.html')

			




	
	
	
		
 

			




	
	
	
		
 
    def raw_changeset(self, revision):

			




	
	
	
		
 

			




	
	
	
		
 
        method = request.GET.get('diff', 'show')

			




	
	
	
		
 
        ignore_whitespace = request.GET.get('ignorews') == '1'

			




	
	
	
		
 
        line_context = request.GET.get('context', 3)

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            c.scm_type = c.rhodecode_repo.alias

			




	
	
	
		
 
            c.changeset = c.rhodecode_repo.get_changeset(revision)

			




	
	
	
		
 
        except RepositoryError:

			




	
	
	
		
 
            log.error(traceback.format_exc())

			




	
	
	
		
 
            return redirect(url('home'))

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            try:

			




	
	
	
		
 
                c.changeset_parent = c.changeset.parents[0]

			




	
	
	
		
 
            except IndexError:

			




	
	
	
		
 
                c.changeset_parent = None

			




	
	
	
		
 
            c.changes = []

			




	
	
	
		
 

			




	
	
	
		
 
            for node in c.changeset.added:

			




	
	
	
		
 
                filenode_old = FileNode(node.path, '')

			




	
	
	
		
 
                if filenode_old.is_binary or node.is_binary:

			




	
	
	
		
 
                    diff = _('binary file') + '\n'

			




	
	
	
		
 
                else:

			




	
	
	
		
 
                    f_gitdiff = diffs.get_gitdiff(filenode_old, node,

			




	
	
	
		
 
                                           ignore_whitespace=ignore_whitespace,

			




	
	
	
		
 
                                           context=line_context)

			




	
	
	
		
 
                    diff = diffs.DiffProcessor(f_gitdiff,

			




	
	
	
		
 
                                                format='gitdiff').raw_diff()

			




	
	
	
		
 

			




	
	
	
		
 
                cs1 = None

			




	
	
	
		
 
                cs2 = node.changeset.raw_id

			




	
	
	
		
 
                c.changes.append(('added', node, diff, cs1, cs2))

			




	
	
	
		
 

			




	
	
	
		
 
            for node in c.changeset.changed:

			




	
	
	
		
 
                filenode_old = c.changeset_parent.get_node(node.path)

			




	
	
	
		
 
                if filenode_old.is_binary or node.is_binary:

			




	
	
	
		
 
                    diff = _('binary file')

			




        

    


    
    

    

        

                

                    rhodecode/model/comment.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -90,69 +90,92 @@ class ChangesetCommentsModel(BaseModel):

			




	
	
	
		
 
                          {'commit_desc': desc, 'line': line},

			




	
	
	
		
 
                          h.url('changeset_home', repo_name=repo.repo_name,

			




	
	
	
		
 
                                revision=revision,

			




	
	
	
		
 
                                anchor='comment-%s' % comment.comment_id,

			




	
	
	
		
 
                                qualified=True,

			




	
	
	
		
 
                          )

			




	
	
	
		
 
                )

			




	
	
	
		
 
            )

			




	
	
	
		
 

			




	
	
	
		
 
            body = text

			




	
	
	
		
 

			




	
	
	
		
 
            # get the current participants of this changeset

			




	
	
	
		
 
            recipients = ChangesetComment.get_users(revision=revision)

			




	
	
	
		
 

			




	
	
	
		
 
            # add changeset author if it's in rhodecode system

			




	
	
	
		
 
            recipients += [User.get_by_email(author_email)]

			




	
	
	
		
 

			




	
	
	
		
 
            # create notification objects, and emails

			




	
	
	
		
 
            NotificationModel().create(

			




	
	
	
		
 
              created_by=user_id, subject=subj, body=body,

			




	
	
	
		
 
              recipients=recipients, type_=Notification.TYPE_CHANGESET_COMMENT,

			




	
	
	
		
 
              email_kwargs={'status_change': status_change}

			




	
	
	
		
 
            )

			




	
	
	
		
 

			




	
	
	
		
 
            mention_recipients = set(self._extract_mentions(body))\

			




	
	
	
		
 
                                    .difference(recipients)

			




	
	
	
		
 
            if mention_recipients:

			




	
	
	
		
 
                subj = _('[Mention]') + ' ' + subj

			




	
	
	
		
 
                NotificationModel().create(

			




	
	
	
		
 
                    created_by=user_id, subject=subj, body=body,

			




	
	
	
		
 
                    recipients=mention_recipients,

			




	
	
	
		
 
                    type_=Notification.TYPE_CHANGESET_COMMENT,

			




	
	
	
		
 
                    email_kwargs={'status_change': status_change}

			




	
	
	
		
 
                )

			




	
	
	
		
 

			




	
	
	
		
 
            return comment

			




	
	
	
		
 

			




	
	
	
		
 
    def delete(self, comment):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Deletes given comment

			




	
	
	
		
 

			




	
	
	
		
 
        :param comment_id:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        comment = self.__get_changeset_comment(comment)

			




	
	
	
		
 
        self.sa.delete(comment)

			




	
	
	
		
 

			




	
	
	
		
 
        return comment

			




	
	
	
		
 

			




	
	
	
		
 
    def get_comments(self, repo_id, revision):

			




	
	
	
		
 
        return ChangesetComment.query()\

			




	
	
	
		
 
    def get_comments(self, repo_id, revision=None, pull_request_id=None):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        Get's main comments based on revision or pull_request_id

			




	
	
	
		
 

			




	
	
	
		
 
        :param repo_id:

			




	
	
	
		
 
        :type repo_id:

			




	
	
	
		
 
        :param revision:

			




	
	
	
		
 
        :type revision:

			




	
	
	
		
 
        :param pull_request_id:

			




	
	
	
		
 
        :type pull_request_id:

			




	
	
	
		
 
        """

			




	
	
	
		
 
        q = ChangesetComment.query()\

			




	
	
	
		
 
                .filter(ChangesetComment.repo_id == repo_id)\

			




	
	
	
		
 
                .filter(ChangesetComment.revision == revision)\

			




	
	
	
		
 
                .filter(ChangesetComment.line_no == None)\

			




	
	
	
		
 
                .filter(ChangesetComment.f_path == None).all()

			




	
	
	
		
 
                .filter(ChangesetComment.f_path == None)

			




	
	
	
		
 
        if revision:

			




	
	
	
		
 
            q = q.filter(ChangesetComment.revision == revision)

			




	
	
	
		
 
        elif pull_request_id:

			




	
	
	
		
 
            q = q.filter(ChangesetComment.pull_request_id == pull_request_id)

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            raise Exception('Please specify revision or pull_request_id')

			




	
	
	
		
 
        return q.all()

			




	
	
	
		
 

			




	
	
	
		
 
    def get_inline_comments(self, repo_id, revision):

			




	
	
	
		
 
        comments = self.sa.query(ChangesetComment)\

			




	
	
	
		
 
    def get_inline_comments(self, repo_id, revision=None, pull_request_id=None):

			




	
	
	
		
 
        q = self.sa.query(ChangesetComment)\

			




	
	
	
		
 
            .filter(ChangesetComment.repo_id == repo_id)\

			




	
	
	
		
 
            .filter(ChangesetComment.revision == revision)\

			




	
	
	
		
 
            .filter(ChangesetComment.line_no != None)\

			




	
	
	
		
 
            .filter(ChangesetComment.f_path != None)\

			




	
	
	
		
 
            .order_by(ChangesetComment.comment_id.asc())\

			




	
	
	
		
 
            .all()

			




	
	
	
		
 

			




	
	
	
		
 
        if revision:

			




	
	
	
		
 
            q = q.filter(ChangesetComment.revision == revision)

			




	
	
	
		
 
        elif pull_request_id:

			




	
	
	
		
 
            q = q.filter(ChangesetComment.pull_request_id == pull_request_id)

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            raise Exception('Please specify revision or pull_request_id')

			




	
	
	
		
 

			




	
	
	
		
 
        comments = q.all()

			




	
	
	
		
 

			




	
	
	
		
 
        paths = defaultdict(lambda: defaultdict(list))

			




	
	
	
		
 

			




	
	
	
		
 
        for co in comments:

			




	
	
	
		
 
            paths[co.f_path][co.line_no].append(co)

			




	
	
	
		
 
        return paths.items()

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -89,94 +89,88 @@

			




	
	
	
		
 
                 %endif

			




	
	
	
		
 
		             %if c.changeset.branch:

			




	
	
	
		
 
                     <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}">

			




	
	
	
		
 
		             ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}

			




	
	
	
		
 
                     </span>

			




	
	
	
		
 
                     %endif

			




	
	
	
		
 
		             %for tag in c.changeset.tags:

			




	
	
	
		
 
		                 <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">

			




	
	
	
		
 
		                 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>

			




	
	
	
		
 
		             %endfor

			




	
	
	
		
 
		         </span>

			




	
	
	
		
 
	                </div>

			




	
	
	
		
 
	        </div>

			




	
	
	
		
 
	        <span>

			




	
	
	
		
 
	        ${_('%s files affected with %s insertions and %s deletions:') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}

			




	
	
	
		
 
	        </span>

			




	
	
	
		
 
	        <div class="cs_files">

			




	
	
	
		
 
	                %for change,filenode,diff,cs1,cs2,stat in c.changes:

			




	
	
	
		
 
	                    <div class="cs_${change}">

			




	
	
	
		
 
                            <div class="node">

			




	
	
	
		
 
                            %if change != 'removed':

			




	
	
	
		
 
                                ${h.link_to(h.safe_unicode(filenode.path),c.anchor_url(filenode.changeset.raw_id,filenode.path,request.GET)+"_target")}

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                                ${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID('',filenode.path)))}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                            </div>

			




	
	
	
		
 
		                    <div class="changes">${h.fancy_file_stats(stat)}</div>

			




	
	
	
		
 
	                    </div>

			




	
	
	
		
 
	                %endfor

			




	
	
	
		
 
	                % if c.cut_off:

			




	
	
	
		
 
	                  ${_('Changeset was too big and was cut off...')}

			




	
	
	
		
 
	                % endif

			




	
	
	
		
 
	        </div>

			




	
	
	
		
 
	    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <script>

			




	
	
	
		
 
    var _USERS_AC_DATA = ${c.users_array|n};

			




	
	
	
		
 
    var _GROUPS_AC_DATA = ${c.users_groups_array|n};

			




	
	
	
		
 
    </script>

			




	
	
	
		
 
    ## diff block

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    ${diff_block.diff_block(c.changes)}

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    ${comment.comment_inline_form(c.changeset)}

			




	
	
	
		
 

			




	
	
	
		
 
    ## render comments

			




	
	
	
		
 
    ${comment.comments(c.changeset)}

			




	
	
	
		
 
    ## render comments main comments form and it status

			




	
	
	
		
 
    ${comment.comments(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id),

			




	
	
	
		
 
                       h.changeset_status(c.rhodecode_db_repo, c.changeset.raw_id))}

			




	
	
	
		
 

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 
      YUE.onDOMReady(function(){

			




	
	
	
		
 
    	  AJAX_COMMENT_URL = "${url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id)}";

			




	
	
	
		
 
    	  AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}"

			




	
	
	
		
 
          YUE.on(YUQ('.show-inline-comments'),'change',function(e){

			




	
	
	
		
 
              var show = 'none';

			




	
	
	
		
 
              var target = e.currentTarget;

			




	
	
	
		
 
              if(target.checked){

			




	
	
	
		
 
                  var show = ''

			




	
	
	
		
 
              }

			




	
	
	
		
 
              var boxid = YUD.getAttribute(target,'id_for');

			




	
	
	
		
 
              var comments = YUQ('#{0} .inline-comments'.format(boxid));

			




	
	
	
		
 
              for(c in comments){

			




	
	
	
		
 
                 YUD.setStyle(comments[c],'display',show);

			




	
	
	
		
 
              }

			




	
	
	
		
 
              var btns = YUQ('#{0} .inline-comments-button'.format(boxid));

			




	
	
	
		
 
              for(c in btns){

			




	
	
	
		
 
                  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
                    
                

        

        

            



	
	
		
 
@@ -32,111 +32,124 @@

			




	
	
	
		
 
  	</div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="comment_inline_form(changeset)">

			




	
	
	
		
 
<div id='comment-inline-form-template' style="display:none">

			




	
	
	
		
 
  <div class="comment-inline-form ac">

			




	
	
	
		
 
  %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 %s syntax with %s support.') % (

			




	
	
	
		
 
                 ('<a href="%s">RST</a>' % h.url('rst_help')),

			




	
	
	
		
 
          	     ('<span style="color:#003367" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this RhodeCode user'))

			




	
	
	
		
 
               )

			




	
	
	
		
 
            )|n

			




	
	
	
		
 
           }

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
            <div class="mentions-container" id="mentions_container_{1}"></div>

			




	
	
	
		
 
            <textarea id="text_{1}" name="text" class="yui-ac-input"></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">

			




	
	
	
		
 
          <div class="comment-help">

			




	
	
	
		
 
            ${_('You need to be logged in to comment.')} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="comment-button">

			




	
	
	
		
 
      ${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      ${h.end_form()}

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="inlines(changeset)">

			




	
	
	
		
 
## generates inlines taken from c.comments var

			




	
	
	
		
 
<%def name="inlines()">

			




	
	
	
		
 
    <div class="comments-number">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</div>

			




	
	
	
		
 
    %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)">

			




	
	
	
		
 
<%def name="comments(post_url, cur_status)">

			




	
	
	
		
 

			




	
	
	
		
 
<div class="comments">

			




	
	
	
		
 
    <div id="inline-comments-container">

			




	
	
	
		
 
     ${inlines(changeset)}

			




	
	
	
		
 
    ## generate inlines for this changeset

			




	
	
	
		
 
     ${inlines()}

			




	
	
	
		
 
    </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 ac">

			




	
	
	
		
 
        ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))}

			




	
	
	
		
 
        ${h.form(post_url)}

			




	
	
	
		
 
        <strong>${_('Leave a comment')}</strong>

			




	
	
	
		
 
        <div class="clearfix">

			




	
	
	
		
 
            <div class="comment-help">

			




	
	
	
		
 
                ${(_('Comments parsed using %s syntax with %s support.') % (('<a href="%s">RST</a>' % h.url('rst_help')),

			




	
	
	
		
 
          		'<span style="color:#003367" class="tooltip" title="%s">@mention</span>' %

			




	
	
	
		
 
          		_('Use @username inside this text to send notification to this RhodeCode user')))|n}

			




	
	
	
		
 
                | <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>

			




	
	
	
		
 
            <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>

			




	
	
	
		
 
                        <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" name="changeset_status" value="${status}"> <label>${lbl}</label>

			




	
	
	
		
 
                    </div>                    

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
            </div>                 

			




	
	
	
		
 
            <div class="mentions-container" id="mentions_container"></div>

			




	
	
	
		
 
             ${h.textarea('text')}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="comment-button">

			




	
	
	
		
 
        ${h.submit('save', _('Comment'), class_='ui-button')}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        ${h.end_form()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</div>

			




	
	
	
		
 
<script>

			




	
	
	
		
 
YUE.onDOMReady(function () {

			




	
	
	
		
 
   MentionsAutoComplete('text', 'mentions_container', _USERS_AC_DATA, _GROUPS_AC_DATA);

			




	
	
	
		
 
   

			




	
	
	
		
 
   // changeset status box listener

			




	
	
	
		
 
   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>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.