##// END OF EJS Templates
rhodecode-enterprise-ce
RSS
pr-versioning: link-changes
marcink -
r1369:daa515c6 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,889 +1,889 b''
1 1 <%inherit file="/base/base.mako"/>
2 2 <%namespace name="base" file="/base/base.mako"/>
3 3
4 4 <%def name="title()">
5 5 ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}
6 6 %if c.rhodecode_name:
7 7 &middot; ${h.branding(c.rhodecode_name)}
8 8 %endif
9 9 </%def>
10 10
11 11 <%def name="breadcrumbs_links()">
12 12 <span id="pr-title">
13 13 ${c.pull_request.title}
14 14 %if c.pull_request.is_closed():
15 15 (${_('Closed')})
16 16 %endif
17 17 </span>
18 18 <div id="pr-title-edit" class="input" style="display: none;">
19 19 ${h.text('pullrequest_title', id_="pr-title-input", class_="large", value=c.pull_request.title)}
20 20 </div>
21 21 </%def>
22 22
23 23 <%def name="menu_bar_nav()">
24 24 ${self.menu_items(active='repositories')}
25 25 </%def>
26 26
27 27 <%def name="menu_bar_subnav()">
28 28 ${self.repo_menu(active='showpullrequest')}
29 29 </%def>
30 30
31 31 <%def name="main()">
32 32
33 33 <script type="text/javascript">
34 34 // TODO: marcink switch this to pyroutes
35 35 AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
36 36 templateContext.pull_request_data.pull_request_id = ${c.pull_request.pull_request_id};
37 37 </script>
38 38 <div class="box">
39 39
40 40 <div class="title">
41 41 ${self.repo_page_title(c.rhodecode_db_repo)}
42 42 </div>
43 43
44 44 ${self.breadcrumbs()}
45 45
46 46 <div class="box pr-summary">
47 47
48 48 <div class="summary-details block-left">
49 49 <% summary = lambda n:{False:'summary-short'}.get(n) %>
50 50 <div class="pr-details-title">
51 51 <a href="${h.url('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request #%s') % c.pull_request.pull_request_id}</a> ${_('From')} ${h.format_date(c.pull_request.created_on)}
52 52 %if c.allowed_to_update:
53 53 <div id="delete_pullrequest" class="pull-right action_button ${'' if c.allowed_to_delete else 'disabled' }" style="clear:inherit;padding: 0">
54 54 % if c.allowed_to_delete:
55 55 ${h.secure_form(url('pullrequest_delete', repo_name=c.pull_request.target_repo.repo_name, pull_request_id=c.pull_request.pull_request_id),method='delete')}
56 56 ${h.submit('remove_%s' % c.pull_request.pull_request_id, _('Delete'),
57 57 class_="btn btn-link btn-danger",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
58 58 ${h.end_form()}
59 59 % else:
60 60 ${_('Delete')}
61 61 % endif
62 62 </div>
63 63 <div id="open_edit_pullrequest" class="pull-right action_button">${_('Edit')}</div>
64 64 <div id="close_edit_pullrequest" class="pull-right action_button" style="display: none;padding: 0">${_('Cancel')}</div>
65 65 %endif
66 66 </div>
67 67
68 68 <div id="summary" class="fields pr-details-content">
69 69 <div class="field">
70 70 <div class="label-summary">
71 71 <label>${_('Origin')}:</label>
72 72 </div>
73 73 <div class="input">
74 74 <div class="pr-origininfo">
75 75 ## branch link is only valid if it is a branch
76 76 <span class="tag">
77 77 %if c.pull_request.source_ref_parts.type == 'branch':
78 78 <a href="${h.url('changelog_home', repo_name=c.pull_request.source_repo.repo_name, branch=c.pull_request.source_ref_parts.name)}">${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}</a>
79 79 %else:
80 80 ${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}
81 81 %endif
82 82 </span>
83 83 <span class="clone-url">
84 84 <a href="${h.url('summary_home', repo_name=c.pull_request.source_repo.repo_name)}">${c.pull_request.source_repo.clone_url()}</a>
85 85 </span>
86 86 </div>
87 87 <div class="pr-pullinfo">
88 88 %if h.is_hg(c.pull_request.source_repo):
89 89 <input type="text" value="hg pull -r ${h.short_id(c.source_ref)} ${c.pull_request.source_repo.clone_url()}" readonly="readonly">
90 90 %elif h.is_git(c.pull_request.source_repo):
91 91 <input type="text" value="git pull ${c.pull_request.source_repo.clone_url()} ${c.pull_request.source_ref_parts.name}" readonly="readonly">
92 92 %endif
93 93 </div>
94 94 </div>
95 95 </div>
96 96 <div class="field">
97 97 <div class="label-summary">
98 98 <label>${_('Target')}:</label>
99 99 </div>
100 100 <div class="input">
101 101 <div class="pr-targetinfo">
102 102 ## branch link is only valid if it is a branch
103 103 <span class="tag">
104 104 %if c.pull_request.target_ref_parts.type == 'branch':
105 105 <a href="${h.url('changelog_home', repo_name=c.pull_request.target_repo.repo_name, branch=c.pull_request.target_ref_parts.name)}">${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}</a>
106 106 %else:
107 107 ${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}
108 108 %endif
109 109 </span>
110 110 <span class="clone-url">
111 111 <a href="${h.url('summary_home', repo_name=c.pull_request.target_repo.repo_name)}">${c.pull_request.target_repo.clone_url()}</a>
112 112 </span>
113 113 </div>
114 114 </div>
115 115 </div>
116 116
117 117 ## Link to the shadow repository.
118 118 <div class="field">
119 119 <div class="label-summary">
120 120 <label>${_('Merge')}:</label>
121 121 </div>
122 122 <div class="input">
123 123 % if not c.pull_request.is_closed() and c.pull_request.shadow_merge_ref:
124 124 <div class="pr-mergeinfo">
125 125 %if h.is_hg(c.pull_request.target_repo):
126 126 <input type="text" value="hg clone -u ${c.pull_request.shadow_merge_ref.name} ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
127 127 %elif h.is_git(c.pull_request.target_repo):
128 128 <input type="text" value="git clone --branch ${c.pull_request.shadow_merge_ref.name} ${c.shadow_clone_url} pull-request-${c.pull_request.pull_request_id}" readonly="readonly">
129 129 %endif
130 130 </div>
131 131 % else:
132 132 <div class="">
133 133 ${_('Shadow repository data not available')}.
134 134 </div>
135 135 % endif
136 136 </div>
137 137 </div>
138 138
139 139 <div class="field">
140 140 <div class="label-summary">
141 141 <label>${_('Review')}:</label>
142 142 </div>
143 143 <div class="input">
144 144 %if c.pull_request_review_status:
145 145 <div class="${'flag_status %s' % c.pull_request_review_status} tooltip pull-left"></div>
146 146 <span class="changeset-status-lbl tooltip">
147 147 %if c.pull_request.is_closed():
148 148 ${_('Closed')},
149 149 %endif
150 150 ${h.commit_status_lbl(c.pull_request_review_status)}
151 151 </span>
152 152 - ${ungettext('calculated based on %s reviewer vote', 'calculated based on %s reviewers votes', len(c.pull_request_reviewers)) % len(c.pull_request_reviewers)}
153 153 %endif
154 154 </div>
155 155 </div>
156 156 <div class="field">
157 157 <div class="pr-description-label label-summary">
158 158 <label>${_('Description')}:</label>
159 159 </div>
160 160 <div id="pr-desc" class="input">
161 161 <div class="pr-description">${h.urlify_commit_message(c.pull_request.description, c.repo_name)}</div>
162 162 </div>
163 163 <div id="pr-desc-edit" class="input textarea editor" style="display: none;">
164 164 <textarea id="pr-description-input" size="30">${c.pull_request.description}</textarea>
165 165 </div>
166 166 </div>
167 167
168 168 <div class="field">
169 169 <div class="label-summary">
170 170 <label>${_('Versions')}:</label>
171 171 </div>
172 172
173 173 <% outdated_comm_count_ver = len(c.inline_versions[None]['outdated']) %>
174 174 <% general_outdated_comm_count_ver = len(c.comment_versions[None]['outdated']) %>
175 175
176 176 <div class="pr-versions">
177 177 % if c.show_version_changes:
178 178 <% outdated_comm_count_ver = len(c.inline_versions[c.at_version_num]['outdated']) %>
179 179 <% general_outdated_comm_count_ver = len(c.comment_versions[c.at_version_num]['outdated']) %>
180 <div id="show-pr-versions" class="input btn btn-link" onclick="return versionController.toggleVersionView(this)"
180 <a id="show-pr-versions" class="input" onclick="return versionController.toggleVersionView(this)" href="#show-pr-versions"
181 181 data-toggle-on="${ungettext('{} version available for this pull request, show it.', '{} versions available for this pull request, show them.', len(c.versions)).format(len(c.versions))}"
182 182 data-toggle-off="${_('Hide all versions of this pull request')}">
183 183 ${ungettext('{} version available for this pull request, show it.', '{} versions available for this pull request, show them.', len(c.versions)).format(len(c.versions))}
184 </div>
184 </a>
185 185 <table>
186 186 ## SHOW ALL VERSIONS OF PR
187 187 <% ver_pr = None %>
188 188
189 189 % for data in reversed(list(enumerate(c.versions, 1))):
190 190 <% ver_pos = data[0] %>
191 191 <% ver = data[1] %>
192 192 <% ver_pr = ver.pull_request_version_id %>
193 193 <% display_row = '' if c.at_version and (c.at_version_num == ver_pr or c.from_version_num == ver_pr) else 'none' %>
194 194
195 195 <tr class="version-pr" style="display: ${display_row}">
196 196 <td>
197 197 <code>
198 198 <a href="${h.url.current(version=ver_pr or 'latest')}">v${ver_pos}</a>
199 199 </code>
200 200 </td>
201 201 <td>
202 202 <input ${'checked="checked"' if c.from_version_num == ver_pr else ''} class="compare-radio-button" type="radio" name="ver_source" value="${ver_pr or 'latest'}" data-ver-pos="${ver_pos}"/>
203 203 <input ${'checked="checked"' if c.at_version_num == ver_pr else ''} class="compare-radio-button" type="radio" name="ver_target" value="${ver_pr or 'latest'}" data-ver-pos="${ver_pos}"/>
204 204 </td>
205 205 <td>
206 206 <% review_status = c.review_versions[ver_pr].status if ver_pr in c.review_versions else 'not_reviewed' %>
207 207 <div class="${'flag_status %s' % review_status} tooltip pull-left" title="${_('Your review status at this version')}">
208 208 </div>
209 209 </td>
210 210 <td>
211 211 % if c.at_version_num != ver_pr:
212 212 <i class="icon-comment"></i>
213 213 <code class="tooltip" title="${_('Comment from pull request version {0}, general:{1} inline:{2}').format(ver_pos, len(c.comment_versions[ver_pr]['at']), len(c.inline_versions[ver_pr]['at']))}">
214 214 ${len(c.comment_versions[ver_pr]['at'])}/${len(c.inline_versions[ver_pr]['at'])}
215 215 </code>
216 216 % endif
217 217 </td>
218 218 <td>
219 219 ##<code>${ver.source_ref_parts.commit_id[:6]}</code>
220 220 </td>
221 221 <td>
222 222 ${h.age_component(ver.updated_on)}
223 223 </td>
224 224 </tr>
225 225 % endfor
226 226
227 227 <tr>
228 228 <td colspan="5">
229 229 <button id="show-version-diff" onclick="return versionController.showVersionDiff()" class="btn btn-sm" style="display: none" data-label-text="${_('show changes between versions')}">
230 230 ${_('show changes between versions')}
231 231 </button>
232 232 </td>
233 233 </tr>
234 234
235 235 ## show comment/inline comments summary
236 236 <%def name="comments_summary()">
237 237 <tr>
238 238 <td colspan="6" class="comments-summary-td">
239 239
240 240 % if c.at_version:
241 241 <% inline_comm_count_ver = len(c.inline_versions[c.at_version_num]['display']) %>
242 242 <% general_comm_count_ver = len(c.comment_versions[c.at_version_num]['display']) %>
243 243 ${_('Comments at this version')}:
244 244 % else:
245 245 <% inline_comm_count_ver = len(c.inline_versions[c.at_version_num]['until']) %>
246 246 <% general_comm_count_ver = len(c.comment_versions[c.at_version_num]['until']) %>
247 247 ${_('Comments for this pull request')}:
248 248 % endif
249 249
250 250
251 251 %if general_comm_count_ver:
252 252 <a href="#comments">${_("%d General ") % general_comm_count_ver}</a>
253 253 %else:
254 254 ${_("%d General ") % general_comm_count_ver}
255 255 %endif
256 256
257 257 %if inline_comm_count_ver:
258 258 , <a href="#" onclick="return Rhodecode.comments.nextComment();" id="inline-comments-counter">${_("%d Inline") % inline_comm_count_ver}</a>
259 259 %else:
260 260 , ${_("%d Inline") % inline_comm_count_ver}
261 261 %endif
262 262
263 263 %if outdated_comm_count_ver:
264 264 , <a href="#" onclick="showOutdated(); Rhodecode.comments.nextOutdatedComment(); return false;">${_("%d Outdated") % outdated_comm_count_ver}</a>
265 265 <a href="#" class="showOutdatedComments" onclick="showOutdated(this); return false;"> | ${_('show outdated comments')}</a>
266 266 <a href="#" class="hideOutdatedComments" style="display: none" onclick="hideOutdated(this); return false;"> | ${_('hide outdated comments')}</a>
267 267 %else:
268 268 , ${_("%d Outdated") % outdated_comm_count_ver}
269 269 %endif
270 270 </td>
271 271 </tr>
272 272 </%def>
273 273 ${comments_summary()}
274 274 </table>
275 275 % else:
276 276 <div class="input">
277 277 ${_('Pull request versions not available')}.
278 278 </div>
279 279 <div>
280 280 <table>
281 281 ${comments_summary()}
282 282 </table>
283 283 </div>
284 284 % endif
285 285 </div>
286 286 </div>
287 287
288 288 <div id="pr-save" class="field" style="display: none;">
289 289 <div class="label-summary"></div>
290 290 <div class="input">
291 291 <span id="edit_pull_request" class="btn btn-small">${_('Save Changes')}</span>
292 292 </div>
293 293 </div>
294 294 </div>
295 295 </div>
296 296 <div>
297 297 ## AUTHOR
298 298 <div class="reviewers-title block-right">
299 299 <div class="pr-details-title">
300 300 ${_('Author')}
301 301 </div>
302 302 </div>
303 303 <div class="block-right pr-details-content reviewers">
304 304 <ul class="group_members">
305 305 <li>
306 306 ${self.gravatar_with_user(c.pull_request.author.email, 16)}
307 307 </li>
308 308 </ul>
309 309 </div>
310 310 ## REVIEWERS
311 311 <div class="reviewers-title block-right">
312 312 <div class="pr-details-title">
313 313 ${_('Pull request reviewers')}
314 314 %if c.allowed_to_update:
315 315 <span id="open_edit_reviewers" class="block-right action_button">${_('Edit')}</span>
316 316 <span id="close_edit_reviewers" class="block-right action_button" style="display: none;">${_('Close')}</span>
317 317 %endif
318 318 </div>
319 319 </div>
320 320 <div id="reviewers" class="block-right pr-details-content reviewers">
321 321 ## members goes here !
322 322 <input type="hidden" name="__start__" value="review_members:sequence">
323 323 <ul id="review_members" class="group_members">
324 324 %for member,reasons,status in c.pull_request_reviewers:
325 325 <li id="reviewer_${member.user_id}">
326 326 <div class="reviewers_member">
327 327 <div class="reviewer_status tooltip" title="${h.tooltip(h.commit_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
328 328 <div class="${'flag_status %s' % (status[0][1].status if status else 'not_reviewed')} pull-left reviewer_member_status"></div>
329 329 </div>
330 330 <div id="reviewer_${member.user_id}_name" class="reviewer_name">
331 331 ${self.gravatar_with_user(member.email, 16)}
332 332 </div>
333 333 <input type="hidden" name="__start__" value="reviewer:mapping">
334 334 <input type="hidden" name="__start__" value="reasons:sequence">
335 335 %for reason in reasons:
336 336 <div class="reviewer_reason">- ${reason}</div>
337 337 <input type="hidden" name="reason" value="${reason}">
338 338
339 339 %endfor
340 340 <input type="hidden" name="__end__" value="reasons:sequence">
341 341 <input id="reviewer_${member.user_id}_input" type="hidden" value="${member.user_id}" name="user_id" />
342 342 <input type="hidden" name="__end__" value="reviewer:mapping">
343 343 %if c.allowed_to_update:
344 344 <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id}, true)" style="visibility: hidden;">
345 345 <i class="icon-remove-sign" ></i>
346 346 </div>
347 347 %endif
348 348 </div>
349 349 </li>
350 350 %endfor
351 351 </ul>
352 352 <input type="hidden" name="__end__" value="review_members:sequence">
353 353 %if not c.pull_request.is_closed():
354 354 <div id="add_reviewer_input" class='ac' style="display: none;">
355 355 %if c.allowed_to_update:
356 356 <div class="reviewer_ac">
357 357 ${h.text('user', class_='ac-input', placeholder=_('Add reviewer'))}
358 358 <div id="reviewers_container"></div>
359 359 </div>
360 360 <div>
361 361 <span id="update_pull_request" class="btn btn-small">${_('Save Changes')}</span>
362 362 </div>
363 363 %endif
364 364 </div>
365 365 %endif
366 366 </div>
367 367 </div>
368 368 </div>
369 369 <div class="box">
370 370 ##DIFF
371 371 <div class="table" >
372 372 <div id="changeset_compare_view_content">
373 373 ##CS
374 374 % if c.missing_requirements:
375 375 <div class="box">
376 376 <div class="alert alert-warning">
377 377 <div>
378 378 <strong>${_('Missing requirements:')}</strong>
379 379 ${_('These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled.')}
380 380 </div>
381 381 </div>
382 382 </div>
383 383 % elif c.missing_commits:
384 384 <div class="box">
385 385 <div class="alert alert-warning">
386 386 <div>
387 387 <strong>${_('Missing commits')}:</strong>
388 388 ${_('This pull request cannot be displayed, because one or more commits no longer exist in the source repository.')}
389 389 ${_('Please update this pull request, push the commits back into the source repository, or consider closing this pull request.')}
390 390 </div>
391 391 </div>
392 392 </div>
393 393 % endif
394 394
395 395 <div class="compare_view_commits_title">
396 396 % if not c.compare_mode:
397 397
398 398 % if c.at_version_pos:
399 399 <h4>
400 400 ${_('Showing changes at v%d, commenting is disabled.') % c.at_version_pos}
401 401 </h4>
402 402 % endif
403 403
404 404 <div class="pull-left">
405 405 <div class="btn-group">
406 406 <a
407 407 class="btn"
408 408 href="#"
409 409 onclick="$('.compare_select').show();$('.compare_select_hidden').hide(); return false">
410 410 ${ungettext('Expand %s commit','Expand %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
411 411 </a>
412 412 <a
413 413 class="btn"
414 414 href="#"
415 415 onclick="$('.compare_select').hide();$('.compare_select_hidden').show(); return false">
416 416 ${ungettext('Collapse %s commit','Collapse %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
417 417 </a>
418 418 </div>
419 419 </div>
420 420
421 421 <div class="pull-right">
422 422 % if c.allowed_to_update and not c.pull_request.is_closed():
423 423 <a id="update_commits" class="btn btn-primary pull-right">${_('Update commits')}</a>
424 424 % else:
425 425 <a class="tooltip btn disabled pull-right" disabled="disabled" title="${_('Update is disabled for current view')}">${_('Update commits')}</a>
426 426 % endif
427 427
428 428 </div>
429 429 % endif
430 430 </div>
431 431
432 432 % if not c.missing_commits:
433 433 % if c.compare_mode:
434 434 % if c.at_version:
435 435 <h4>
436 436 ${_('Commits and changes between v{ver_from} and {ver_to} of this pull request, commenting is disabled').format(ver_from=c.from_version_pos, ver_to=c.at_version_pos if c.at_version_pos else 'latest')}:
437 437 </h4>
438 438
439 439 <div class="subtitle-compare">
440 440 ${_('commits added: {}, removed: {}').format(len(c.commit_changes_summary.added), len(c.commit_changes_summary.removed))}
441 441 </div>
442 442
443 443 <div class="container">
444 444 <table class="rctable compare_view_commits">
445 445 <tr>
446 446 <th></th>
447 447 <th>${_('Time')}</th>
448 448 <th>${_('Author')}</th>
449 449 <th>${_('Commit')}</th>
450 450 <th></th>
451 451 <th>${_('Description')}</th>
452 452 </tr>
453 453
454 454 % for c_type, commit in c.commit_changes:
455 455 % if c_type in ['a', 'r']:
456 456 <%
457 457 if c_type == 'a':
458 458 cc_title = _('Commit added in displayed changes')
459 459 elif c_type == 'r':
460 460 cc_title = _('Commit removed in displayed changes')
461 461 else:
462 462 cc_title = ''
463 463 %>
464 464 <tr id="row-${commit.raw_id}" commit_id="${commit.raw_id}" class="compare_select">
465 465 <td>
466 466 <div class="commit-change-indicator color-${c_type}-border">
467 467 <div class="commit-change-content color-${c_type} tooltip" title="${cc_title}">
468 468 ${c_type.upper()}
469 469 </div>
470 470 </div>
471 471 </td>
472 472 <td class="td-time">
473 473 ${h.age_component(commit.date)}
474 474 </td>
475 475 <td class="td-user">
476 476 ${base.gravatar_with_user(commit.author, 16)}
477 477 </td>
478 478 <td class="td-hash">
479 479 <code>
480 480 <a href="${h.url('changeset_home', repo_name=c.target_repo.repo_name, revision=commit.raw_id)}">
481 481 r${commit.revision}:${h.short_id(commit.raw_id)}
482 482 </a>
483 483 ${h.hidden('revisions', commit.raw_id)}
484 484 </code>
485 485 </td>
486 486 <td class="expand_commit" data-commit-id="${commit.raw_id}" title="${_( 'Expand commit message')}">
487 487 <div class="show_more_col">
488 488 <i class="show_more"></i>
489 489 </div>
490 490 </td>
491 491 <td class="mid td-description">
492 492 <div class="log-container truncate-wrap">
493 493 <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">
494 494 ${h.urlify_commit_message(commit.message, c.repo_name)}
495 495 </div>
496 496 </div>
497 497 </td>
498 498 </tr>
499 499 % endif
500 500 % endfor
501 501 </table>
502 502 </div>
503 503
504 504 <script>
505 505 $('.expand_commit').on('click',function(e){
506 506 var target_expand = $(this);
507 507 var cid = target_expand.data('commitId');
508 508
509 509 if (target_expand.hasClass('open')){
510 510 $('#c-'+cid).css({
511 511 'height': '1.5em',
512 512 'white-space': 'nowrap',
513 513 'text-overflow': 'ellipsis',
514 514 'overflow':'hidden'
515 515 });
516 516 target_expand.removeClass('open');
517 517 }
518 518 else {
519 519 $('#c-'+cid).css({
520 520 'height': 'auto',
521 521 'white-space': 'pre-line',
522 522 'text-overflow': 'initial',
523 523 'overflow':'visible'
524 524 });
525 525 target_expand.addClass('open');
526 526 }
527 527 });
528 528 </script>
529 529
530 530 % endif
531 531
532 532 % else:
533 533 <%include file="/compare/compare_commits.mako" />
534 534 % endif
535 535
536 536 <div class="cs_files">
537 537 <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
538 538 ${cbdiffs.render_diffset_menu()}
539 539 ${cbdiffs.render_diffset(
540 540 c.diffset, use_comments=True,
541 541 collapse_when_files_over=30,
542 542 disable_new_comments=not c.allowed_to_comment,
543 543 deleted_files_comments=c.deleted_files_comments)}
544 544 </div>
545 545 % else:
546 546 ## skipping commits we need to clear the view for missing commits
547 547 <div style="clear:both;"></div>
548 548 % endif
549 549
550 550 </div>
551 551 </div>
552 552
553 553 ## template for inline comment form
554 554 <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
555 555
556 556 ## render general comments
557 557
558 558 <div id="comment-tr-show">
559 559 <div class="comment">
560 560 % if general_outdated_comm_count_ver:
561 561 <div class="meta">
562 562 % if general_outdated_comm_count_ver == 1:
563 563 ${_('there is {num} general comment from older versions').format(num=general_outdated_comm_count_ver)},
564 <a href="#" onclick="$('.comment-general.comment-outdated').show(); $(this).parent().hide(); return false;">${_('show it')}</a>
564 <a href="#show-hidden-comments" onclick="$('.comment-general.comment-outdated').show(); $(this).parent().hide(); return false;">${_('show it')}</a>
565 565 % else:
566 566 ${_('there are {num} general comments from older versions').format(num=general_outdated_comm_count_ver)},
567 <a href="#" onclick="$('.comment-general.comment-outdated').show(); $(this).parent().hide(); return false;">${_('show them')}</a>
567 <a href="#show-hidden-comments" onclick="$('.comment-general.comment-outdated').show(); $(this).parent().hide(); return false;">${_('show them')}</a>
568 568 % endif
569 569 </div>
570 570 % endif
571 571 </div>
572 572 </div>
573 573
574 574 ${comment.generate_comments(c.comments, include_pull_request=True, is_pull_request=True)}
575 575
576 576 % if not c.pull_request.is_closed():
577 577 ## merge status, and merge action
578 578 <div class="pull-request-merge">
579 579 <%include file="/pullrequests/pullrequest_merge_checks.mako"/>
580 580 </div>
581 581
582 582 ## main comment form and it status
583 583 ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,
584 584 pull_request_id=c.pull_request.pull_request_id),
585 585 c.pull_request_review_status,
586 586 is_pull_request=True, change_status=c.allowed_to_change_status)}
587 587 %endif
588 588
589 589 <script type="text/javascript">
590 590 if (location.hash) {
591 591 var result = splitDelimitedHash(location.hash);
592 592 var line = $('html').find(result.loc);
593 593 // show hidden comments if we use location.hash
594 594 if (line.hasClass('comment-general')) {
595 595 $(line).show();
596 596 } else if (line.hasClass('comment-inline')) {
597 597 $(line).show();
598 598 var $cb = $(line).closest('.cb');
599 599 $cb.removeClass('cb-collapsed')
600 600 }
601 601 if (line.length > 0){
602 602 offsetScroll(line, 70);
603 603 }
604 604 }
605 605
606 606 VersionController = function() {
607 607 var self = this;
608 608 this.$verSource = $('input[name=ver_source]');
609 609 this.$verTarget = $('input[name=ver_target]');
610 610
611 611 this.adjustRadioSelectors = function (curNode) {
612 612 var getVal = function(item) {
613 613 if (item == 'latest'){
614 614 return Number.MAX_SAFE_INTEGER
615 615 }
616 616 else {
617 617 return parseInt(item)
618 618 }
619 619 };
620 620
621 621 var curVal = getVal($(curNode).val());
622 622 $.each(self.$verSource, function(index, value){
623 623 var elVal = getVal($(value).val());
624 624 if(elVal > curVal){
625 625 $(value).attr('disabled', 'disabled');
626 626 $(value).removeAttr('checked');
627 627 }
628 628 else{
629 629 $(value).removeAttr('disabled');
630 630 }
631 631 });
632 632
633 633 self.setLockAction(false, $(curNode).data('verPos'));
634 634 };
635 635
636 636
637 637 this.attachVersionListener = function () {
638 638 self.$verTarget.change(function(e){
639 639 self.adjustRadioSelectors(this)
640 640 });
641 641 self.$verSource.change(function(e){
642 642 self.adjustRadioSelectors(self.$verTarget.filter(':checked'))
643 643 });
644 644 };
645 645
646 646 this.init = function () {
647 647
648 648 var curNode = self.$verTarget.filter(':checked');
649 649 self.adjustRadioSelectors(curNode);
650 650 self.setLockAction(true);
651 651 self.attachVersionListener();
652 652
653 653 };
654 654
655 655 this.setLockAction = function (state, selectedVersion) {
656 656 if(state){
657 657 $('#show-version-diff').attr('disabled','disabled')
658 658 $('#show-version-diff').addClass('disabled')
659 659 $('#show-version-diff').html($('#show-version-diff').data('labelText'));
660 660 }
661 661 else{
662 662 $('#show-version-diff').removeAttr('disabled');
663 663 $('#show-version-diff').removeClass('disabled')
664 664 //$('#show-version-diff').html(_gettext('show changes for v') + selectedVersion)
665 665 }
666 666
667 667 };
668 668
669 669 this.showVersionDiff = function(){
670 670 var target = self.$verTarget.filter(':checked');
671 671 var source = self.$verSource.filter(':checked');
672 672
673 673 if (target.val() && source.val()) {
674 674 var params = {
675 675 'pull_request_id': ${c.pull_request.pull_request_id},
676 676 'repo_name': templateContext.repo_name,
677 677 'version': target.val(),
678 678 'from_version': source.val()
679 679 };
680 680 window.location = pyroutes.url('pullrequest_show', params)
681 681 }
682 682
683 683 return false;
684 684 };
685 685
686 686 this.toggleVersionView = function (elem) {
687 687
688 688 if ($('#show-version-diff').is(':visible')) {
689 689 $('.version-pr').hide();
690 690 $('#show-version-diff').hide();
691 691 $(elem).html($(elem).data('toggleOn'))
692 692 } else {
693 693 $('.version-pr').show();
694 694 $('#show-version-diff').show();
695 695 $(elem).html($(elem).data('toggleOff'))
696 696 }
697 697
698 698 return false
699 699 }
700 700
701 701 };
702 702
703 703 versionController = new VersionController();
704 704 versionController.init();
705 705
706 706
707 707 $(function(){
708 708 ReviewerAutoComplete('user');
709 709 // custom code mirror
710 710 var codeMirrorInstance = initPullRequestsCodeMirror('#pr-description-input');
711 711
712 712 var PRDetails = {
713 713 editButton: $('#open_edit_pullrequest'),
714 714 closeButton: $('#close_edit_pullrequest'),
715 715 deleteButton: $('#delete_pullrequest'),
716 716 viewFields: $('#pr-desc, #pr-title'),
717 717 editFields: $('#pr-desc-edit, #pr-title-edit, #pr-save'),
718 718
719 719 init: function() {
720 720 var that = this;
721 721 this.editButton.on('click', function(e) { that.edit(); });
722 722 this.closeButton.on('click', function(e) { that.view(); });
723 723 },
724 724
725 725 edit: function(event) {
726 726 this.viewFields.hide();
727 727 this.editButton.hide();
728 728 this.deleteButton.hide();
729 729 this.closeButton.show();
730 730 this.editFields.show();
731 731 codeMirrorInstance.refresh();
732 732 },
733 733
734 734 view: function(event) {
735 735 this.editButton.show();
736 736 this.deleteButton.show();
737 737 this.editFields.hide();
738 738 this.closeButton.hide();
739 739 this.viewFields.show();
740 740 }
741 741 };
742 742
743 743 var ReviewersPanel = {
744 744 editButton: $('#open_edit_reviewers'),
745 745 closeButton: $('#close_edit_reviewers'),
746 746 addButton: $('#add_reviewer_input'),
747 747 removeButtons: $('.reviewer_member_remove'),
748 748
749 749 init: function() {
750 750 var that = this;
751 751 this.editButton.on('click', function(e) { that.edit(); });
752 752 this.closeButton.on('click', function(e) { that.close(); });
753 753 },
754 754
755 755 edit: function(event) {
756 756 this.editButton.hide();
757 757 this.closeButton.show();
758 758 this.addButton.show();
759 759 this.removeButtons.css('visibility', 'visible');
760 760 },
761 761
762 762 close: function(event) {
763 763 this.editButton.show();
764 764 this.closeButton.hide();
765 765 this.addButton.hide();
766 766 this.removeButtons.css('visibility', 'hidden');
767 767 }
768 768 };
769 769
770 770 PRDetails.init();
771 771 ReviewersPanel.init();
772 772
773 773 showOutdated = function(self){
774 774 $('.comment-inline.comment-outdated').show();
775 775 $('.filediff-outdated').show();
776 776 $('.showOutdatedComments').hide();
777 777 $('.hideOutdatedComments').show();
778 778 };
779 779
780 780 hideOutdated = function(self){
781 781 $('.comment-inline.comment-outdated').hide();
782 782 $('.filediff-outdated').hide();
783 783 $('.hideOutdatedComments').hide();
784 784 $('.showOutdatedComments').show();
785 785 };
786 786
787 787 refreshMergeChecks = function(){
788 788 var loadUrl = "${h.url.current(merge_checks=1)}";
789 789 $('.pull-request-merge').css('opacity', 0.3);
790 790 $('.pull-request-merge').load(
791 791 loadUrl,function() {
792 792 $('.pull-request-merge').css('opacity', 1);
793 793 }
794 794 );
795 795 };
796 796
797 797 $('#show-outdated-comments').on('click', function(e){
798 798 var button = $(this);
799 799 var outdated = $('.comment-outdated');
800 800
801 801 if (button.html() === "(Show)") {
802 802 button.html("(Hide)");
803 803 outdated.show();
804 804 } else {
805 805 button.html("(Show)");
806 806 outdated.hide();
807 807 }
808 808 });
809 809
810 810 $('.show-inline-comments').on('change', function(e){
811 811 var show = 'none';
812 812 var target = e.currentTarget;
813 813 if(target.checked){
814 814 show = ''
815 815 }
816 816 var boxid = $(target).attr('id_for');
817 817 var comments = $('#{0} .inline-comments'.format(boxid));
818 818 var fn_display = function(idx){
819 819 $(this).css('display', show);
820 820 };
821 821 $(comments).each(fn_display);
822 822 var btns = $('#{0} .inline-comments-button'.format(boxid));
823 823 $(btns).each(fn_display);
824 824 });
825 825
826 826 $('#merge_pull_request_form').submit(function() {
827 827 if (!$('#merge_pull_request').attr('disabled')) {
828 828 $('#merge_pull_request').attr('disabled', 'disabled');
829 829 }
830 830 return true;
831 831 });
832 832
833 833 $('#edit_pull_request').on('click', function(e){
834 834 var title = $('#pr-title-input').val();
835 835 var description = codeMirrorInstance.getValue();
836 836 editPullRequest(
837 837 "${c.repo_name}", "${c.pull_request.pull_request_id}",
838 838 title, description);
839 839 });
840 840
841 841 $('#update_pull_request').on('click', function(e){
842 842 updateReviewers(undefined, "${c.repo_name}", "${c.pull_request.pull_request_id}");
843 843 });
844 844
845 845 $('#update_commits').on('click', function(e){
846 846 var isDisabled = !$(e.currentTarget).attr('disabled');
847 847 $(e.currentTarget).text(_gettext('Updating...'));
848 848 $(e.currentTarget).attr('disabled', 'disabled');
849 849 if(isDisabled){
850 850 updateCommits("${c.repo_name}", "${c.pull_request.pull_request_id}");
851 851 }
852 852
853 853 });
854 854 // fixing issue with caches on firefox
855 855 $('#update_commits').removeAttr("disabled");
856 856
857 857 $('#close_pull_request').on('click', function(e){
858 858 closePullRequest("${c.repo_name}", "${c.pull_request.pull_request_id}");
859 859 });
860 860
861 861 $('.show-inline-comments').on('click', function(e){
862 862 var boxid = $(this).attr('data-comment-id');
863 863 var button = $(this);
864 864
865 865 if(button.hasClass("comments-visible")) {
866 866 $('#{0} .inline-comments'.format(boxid)).each(function(index){
867 867 $(this).hide();
868 868 });
869 869 button.removeClass("comments-visible");
870 870 } else {
871 871 $('#{0} .inline-comments'.format(boxid)).each(function(index){
872 872 $(this).show();
873 873 });
874 874 button.addClass("comments-visible");
875 875 }
876 876 });
877 877
878 878 // register submit callback on commentForm form to track TODOs
879 879 window.commentFormGlobalSubmitSuccessCallback = function(){
880 880 refreshMergeChecks();
881 881 };
882 882
883 883 })
884 884 </script>
885 885
886 886 </div>
887 887 </div>
888 888
889 889 </%def>
General Comments 0
You need to be logged in to leave comments. Login now