Mercurial > kallithea
comparison rhodecode/templates/changeset/changeset_file_comment.html @ 3229:aad51f79d040 beta
added a flag for generating pull-request comments, and force display on pull-requests
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 26 Jan 2013 21:21:11 +0100 |
parents | 81bbb8086f03 |
children | 0cbf8a502a49 |
comparison
equal
deleted
inserted
replaced
3228:ba2e2514a01a | 3229:aad51f79d040 |
---|---|
106 %endfor | 106 %endfor |
107 | 107 |
108 </%def> | 108 </%def> |
109 | 109 |
110 ## generate inline comments and the main ones | 110 ## generate inline comments and the main ones |
111 <%def name="generate_comments()"> | 111 <%def name="generate_comments(include_pr=False)"> |
112 <div class="comments"> | 112 <div class="comments"> |
113 <div id="inline-comments-container"> | 113 <div id="inline-comments-container"> |
114 ## generate inlines for this changeset | 114 ## generate inlines for this changeset |
115 ${inlines()} | 115 ${inlines()} |
116 </div> | 116 </div> |
117 | 117 |
118 %for co in c.comments: | 118 %for co in c.comments: |
119 <div id="comment-tr-${co.comment_id}"> | 119 <div id="comment-tr-${co.comment_id}"> |
120 ## only render comments that are not from pull request, or from | 120 ## only render comments that are not from pull request, or from |
121 ## pull request and a status change | 121 ## pull request and a status change |
122 %if not co.pull_request or co.pull_request and co.status_change: | 122 %if not co.pull_request or (co.pull_request and co.status_change) or include_pr: |
123 ${comment_block(co)} | 123 ${comment_block(co)} |
124 %endif | 124 %endif |
125 </div> | 125 </div> |
126 %endfor | 126 %endfor |
127 </div> | 127 </div> |