##// END OF EJS Templates
pull-requests: show version age component should use local dates.
marcink -
r1451:ed905cdf default
parent child Browse files
Show More
@@ -1,818 +1,818 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 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 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 G:${len(c.comment_versions[ver_pr]['at'])} / I:${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 ${h.age_component(ver.updated_on)}
222 ${h.age_component(ver.updated_on, time_is_local=True)}
223 223 </td>
224 224 </tr>
225 225 % endfor
226 226
227 227 <tr>
228 228 <td colspan="6">
229 229 <button id="show-version-diff" onclick="return versionController.showVersionDiff()" class="btn btn-sm" style="display: none"
230 230 data-label-text-locked="${_('select versions to show changes')}"
231 231 data-label-text-diff="${_('show changes between versions')}"
232 232 data-label-text-show="${_('show pull request for this version')}"
233 233 >
234 234 ${_('select versions to show changes')}
235 235 </button>
236 236 </td>
237 237 </tr>
238 238
239 239 ## show comment/inline comments summary
240 240 <%def name="comments_summary()">
241 241 <tr>
242 242 <td colspan="6" class="comments-summary-td">
243 243
244 244 % if c.at_version:
245 245 <% inline_comm_count_ver = len(c.inline_versions[c.at_version_num]['display']) %>
246 246 <% general_comm_count_ver = len(c.comment_versions[c.at_version_num]['display']) %>
247 247 ${_('Comments at this version')}:
248 248 % else:
249 249 <% inline_comm_count_ver = len(c.inline_versions[c.at_version_num]['until']) %>
250 250 <% general_comm_count_ver = len(c.comment_versions[c.at_version_num]['until']) %>
251 251 ${_('Comments for this pull request')}:
252 252 % endif
253 253
254 254
255 255 %if general_comm_count_ver:
256 256 <a href="#comments">${_("%d General ") % general_comm_count_ver}</a>
257 257 %else:
258 258 ${_("%d General ") % general_comm_count_ver}
259 259 %endif
260 260
261 261 %if inline_comm_count_ver:
262 262 , <a href="#" onclick="return Rhodecode.comments.nextComment();" id="inline-comments-counter">${_("%d Inline") % inline_comm_count_ver}</a>
263 263 %else:
264 264 , ${_("%d Inline") % inline_comm_count_ver}
265 265 %endif
266 266
267 267 %if outdated_comm_count_ver:
268 268 , <a href="#" onclick="showOutdated(); Rhodecode.comments.nextOutdatedComment(); return false;">${_("%d Outdated") % outdated_comm_count_ver}</a>
269 269 <a href="#" class="showOutdatedComments" onclick="showOutdated(this); return false;"> | ${_('show outdated comments')}</a>
270 270 <a href="#" class="hideOutdatedComments" style="display: none" onclick="hideOutdated(this); return false;"> | ${_('hide outdated comments')}</a>
271 271 %else:
272 272 , ${_("%d Outdated") % outdated_comm_count_ver}
273 273 %endif
274 274 </td>
275 275 </tr>
276 276 </%def>
277 277 ${comments_summary()}
278 278 </table>
279 279 % else:
280 280 <div class="input">
281 281 ${_('Pull request versions not available')}.
282 282 </div>
283 283 <div>
284 284 <table>
285 285 ${comments_summary()}
286 286 </table>
287 287 </div>
288 288 % endif
289 289 </div>
290 290 </div>
291 291
292 292 <div id="pr-save" class="field" style="display: none;">
293 293 <div class="label-summary"></div>
294 294 <div class="input">
295 295 <span id="edit_pull_request" class="btn btn-small">${_('Save Changes')}</span>
296 296 </div>
297 297 </div>
298 298 </div>
299 299 </div>
300 300 <div>
301 301 ## AUTHOR
302 302 <div class="reviewers-title block-right">
303 303 <div class="pr-details-title">
304 304 ${_('Author')}
305 305 </div>
306 306 </div>
307 307 <div class="block-right pr-details-content reviewers">
308 308 <ul class="group_members">
309 309 <li>
310 310 ${self.gravatar_with_user(c.pull_request.author.email, 16)}
311 311 </li>
312 312 </ul>
313 313 </div>
314 314 ## REVIEWERS
315 315 <div class="reviewers-title block-right">
316 316 <div class="pr-details-title">
317 317 ${_('Pull request reviewers')}
318 318 %if c.allowed_to_update:
319 319 <span id="open_edit_reviewers" class="block-right action_button">${_('Edit')}</span>
320 320 <span id="close_edit_reviewers" class="block-right action_button" style="display: none;">${_('Close')}</span>
321 321 %endif
322 322 </div>
323 323 </div>
324 324 <div id="reviewers" class="block-right pr-details-content reviewers">
325 325 ## members goes here !
326 326 <input type="hidden" name="__start__" value="review_members:sequence">
327 327 <ul id="review_members" class="group_members">
328 328 %for member,reasons,status in c.pull_request_reviewers:
329 329 <li id="reviewer_${member.user_id}">
330 330 <div class="reviewers_member">
331 331 <div class="reviewer_status tooltip" title="${h.tooltip(h.commit_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
332 332 <div class="${'flag_status %s' % (status[0][1].status if status else 'not_reviewed')} pull-left reviewer_member_status"></div>
333 333 </div>
334 334 <div id="reviewer_${member.user_id}_name" class="reviewer_name">
335 335 ${self.gravatar_with_user(member.email, 16)}
336 336 </div>
337 337 <input type="hidden" name="__start__" value="reviewer:mapping">
338 338 <input type="hidden" name="__start__" value="reasons:sequence">
339 339 %for reason in reasons:
340 340 <div class="reviewer_reason">- ${reason}</div>
341 341 <input type="hidden" name="reason" value="${reason}">
342 342
343 343 %endfor
344 344 <input type="hidden" name="__end__" value="reasons:sequence">
345 345 <input id="reviewer_${member.user_id}_input" type="hidden" value="${member.user_id}" name="user_id" />
346 346 <input type="hidden" name="__end__" value="reviewer:mapping">
347 347 %if c.allowed_to_update:
348 348 <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id}, true)" style="visibility: hidden;">
349 349 <i class="icon-remove-sign" ></i>
350 350 </div>
351 351 %endif
352 352 </div>
353 353 </li>
354 354 %endfor
355 355 </ul>
356 356 <input type="hidden" name="__end__" value="review_members:sequence">
357 357 %if not c.pull_request.is_closed():
358 358 <div id="add_reviewer_input" class='ac' style="display: none;">
359 359 %if c.allowed_to_update:
360 360 <div class="reviewer_ac">
361 361 ${h.text('user', class_='ac-input', placeholder=_('Add reviewer'))}
362 362 <div id="reviewers_container"></div>
363 363 </div>
364 364 <div>
365 365 <span id="update_pull_request" class="btn btn-small">${_('Save Changes')}</span>
366 366 </div>
367 367 %endif
368 368 </div>
369 369 %endif
370 370 </div>
371 371 </div>
372 372 </div>
373 373 <div class="box">
374 374 ##DIFF
375 375 <div class="table" >
376 376 <div id="changeset_compare_view_content">
377 377 ##CS
378 378 % if c.missing_requirements:
379 379 <div class="box">
380 380 <div class="alert alert-warning">
381 381 <div>
382 382 <strong>${_('Missing requirements:')}</strong>
383 383 ${_('These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled.')}
384 384 </div>
385 385 </div>
386 386 </div>
387 387 % elif c.missing_commits:
388 388 <div class="box">
389 389 <div class="alert alert-warning">
390 390 <div>
391 391 <strong>${_('Missing commits')}:</strong>
392 392 ${_('This pull request cannot be displayed, because one or more commits no longer exist in the source repository.')}
393 393 ${_('Please update this pull request, push the commits back into the source repository, or consider closing this pull request.')}
394 394 </div>
395 395 </div>
396 396 </div>
397 397 % endif
398 398
399 399 <div class="compare_view_commits_title">
400 400 % if not c.compare_mode:
401 401
402 402 % if c.at_version_pos:
403 403 <h4>
404 404 ${_('Showing changes at v%d, commenting is disabled.') % c.at_version_pos}
405 405 </h4>
406 406 % endif
407 407
408 408 <div class="pull-left">
409 409 <div class="btn-group">
410 410 <a
411 411 class="btn"
412 412 href="#"
413 413 onclick="$('.compare_select').show();$('.compare_select_hidden').hide(); return false">
414 414 ${ungettext('Expand %s commit','Expand %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
415 415 </a>
416 416 <a
417 417 class="btn"
418 418 href="#"
419 419 onclick="$('.compare_select').hide();$('.compare_select_hidden').show(); return false">
420 420 ${ungettext('Collapse %s commit','Collapse %s commits', len(c.commit_ranges)) % len(c.commit_ranges)}
421 421 </a>
422 422 </div>
423 423 </div>
424 424
425 425 <div class="pull-right">
426 426 % if c.allowed_to_update and not c.pull_request.is_closed():
427 427 <a id="update_commits" class="btn btn-primary pull-right">${_('Update commits')}</a>
428 428 % else:
429 429 <a class="tooltip btn disabled pull-right" disabled="disabled" title="${_('Update is disabled for current view')}">${_('Update commits')}</a>
430 430 % endif
431 431
432 432 </div>
433 433 % endif
434 434 </div>
435 435
436 436 % if not c.missing_commits:
437 437 % if c.compare_mode:
438 438 % if c.at_version:
439 439 <h4>
440 440 ${_('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')}:
441 441 </h4>
442 442
443 443 <div class="subtitle-compare">
444 444 ${_('commits added: {}, removed: {}').format(len(c.commit_changes_summary.added), len(c.commit_changes_summary.removed))}
445 445 </div>
446 446
447 447 <div class="container">
448 448 <table class="rctable compare_view_commits">
449 449 <tr>
450 450 <th></th>
451 451 <th>${_('Time')}</th>
452 452 <th>${_('Author')}</th>
453 453 <th>${_('Commit')}</th>
454 454 <th></th>
455 455 <th>${_('Description')}</th>
456 456 </tr>
457 457
458 458 % for c_type, commit in c.commit_changes:
459 459 % if c_type in ['a', 'r']:
460 460 <%
461 461 if c_type == 'a':
462 462 cc_title = _('Commit added in displayed changes')
463 463 elif c_type == 'r':
464 464 cc_title = _('Commit removed in displayed changes')
465 465 else:
466 466 cc_title = ''
467 467 %>
468 468 <tr id="row-${commit.raw_id}" commit_id="${commit.raw_id}" class="compare_select">
469 469 <td>
470 470 <div class="commit-change-indicator color-${c_type}-border">
471 471 <div class="commit-change-content color-${c_type} tooltip" title="${cc_title}">
472 472 ${c_type.upper()}
473 473 </div>
474 474 </div>
475 475 </td>
476 476 <td class="td-time">
477 477 ${h.age_component(commit.date)}
478 478 </td>
479 479 <td class="td-user">
480 480 ${base.gravatar_with_user(commit.author, 16)}
481 481 </td>
482 482 <td class="td-hash">
483 483 <code>
484 484 <a href="${h.url('changeset_home', repo_name=c.target_repo.repo_name, revision=commit.raw_id)}">
485 485 r${commit.revision}:${h.short_id(commit.raw_id)}
486 486 </a>
487 487 ${h.hidden('revisions', commit.raw_id)}
488 488 </code>
489 489 </td>
490 490 <td class="expand_commit" data-commit-id="${commit.raw_id}" title="${_( 'Expand commit message')}">
491 491 <div class="show_more_col">
492 492 <i class="show_more"></i>
493 493 </div>
494 494 </td>
495 495 <td class="mid td-description">
496 496 <div class="log-container truncate-wrap">
497 497 <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">
498 498 ${h.urlify_commit_message(commit.message, c.repo_name)}
499 499 </div>
500 500 </div>
501 501 </td>
502 502 </tr>
503 503 % endif
504 504 % endfor
505 505 </table>
506 506 </div>
507 507
508 508 <script>
509 509 $('.expand_commit').on('click',function(e){
510 510 var target_expand = $(this);
511 511 var cid = target_expand.data('commitId');
512 512
513 513 if (target_expand.hasClass('open')){
514 514 $('#c-'+cid).css({
515 515 'height': '1.5em',
516 516 'white-space': 'nowrap',
517 517 'text-overflow': 'ellipsis',
518 518 'overflow':'hidden'
519 519 });
520 520 target_expand.removeClass('open');
521 521 }
522 522 else {
523 523 $('#c-'+cid).css({
524 524 'height': 'auto',
525 525 'white-space': 'pre-line',
526 526 'text-overflow': 'initial',
527 527 'overflow':'visible'
528 528 });
529 529 target_expand.addClass('open');
530 530 }
531 531 });
532 532 </script>
533 533
534 534 % endif
535 535
536 536 % else:
537 537 <%include file="/compare/compare_commits.mako" />
538 538 % endif
539 539
540 540 <div class="cs_files">
541 541 <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
542 542 ${cbdiffs.render_diffset_menu()}
543 543 ${cbdiffs.render_diffset(
544 544 c.diffset, use_comments=True,
545 545 collapse_when_files_over=30,
546 546 disable_new_comments=not c.allowed_to_comment,
547 547 deleted_files_comments=c.deleted_files_comments)}
548 548 </div>
549 549 % else:
550 550 ## skipping commits we need to clear the view for missing commits
551 551 <div style="clear:both;"></div>
552 552 % endif
553 553
554 554 </div>
555 555 </div>
556 556
557 557 ## template for inline comment form
558 558 <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
559 559
560 560 ## render general comments
561 561
562 562 <div id="comment-tr-show">
563 563 <div class="comment">
564 564 % if general_outdated_comm_count_ver:
565 565 <div class="meta">
566 566 % if general_outdated_comm_count_ver == 1:
567 567 ${_('there is {num} general comment from older versions').format(num=general_outdated_comm_count_ver)},
568 568 <a href="#show-hidden-comments" onclick="$('.comment-general.comment-outdated').show(); $(this).parent().hide(); return false;">${_('show it')}</a>
569 569 % else:
570 570 ${_('there are {num} general comments from older versions').format(num=general_outdated_comm_count_ver)},
571 571 <a href="#show-hidden-comments" onclick="$('.comment-general.comment-outdated').show(); $(this).parent().hide(); return false;">${_('show them')}</a>
572 572 % endif
573 573 </div>
574 574 % endif
575 575 </div>
576 576 </div>
577 577
578 578 ${comment.generate_comments(c.comments, include_pull_request=True, is_pull_request=True)}
579 579
580 580 % if not c.pull_request.is_closed():
581 581 ## merge status, and merge action
582 582 <div class="pull-request-merge">
583 583 <%include file="/pullrequests/pullrequest_merge_checks.mako"/>
584 584 </div>
585 585
586 586 ## main comment form and it status
587 587 ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,
588 588 pull_request_id=c.pull_request.pull_request_id),
589 589 c.pull_request_review_status,
590 590 is_pull_request=True, change_status=c.allowed_to_change_status)}
591 591 %endif
592 592
593 593 <script type="text/javascript">
594 594 if (location.hash) {
595 595 var result = splitDelimitedHash(location.hash);
596 596 var line = $('html').find(result.loc);
597 597 // show hidden comments if we use location.hash
598 598 if (line.hasClass('comment-general')) {
599 599 $(line).show();
600 600 } else if (line.hasClass('comment-inline')) {
601 601 $(line).show();
602 602 var $cb = $(line).closest('.cb');
603 603 $cb.removeClass('cb-collapsed')
604 604 }
605 605 if (line.length > 0){
606 606 offsetScroll(line, 70);
607 607 }
608 608 }
609 609
610 610 versionController = new VersionController();
611 611 versionController.init();
612 612
613 613
614 614 $(function(){
615 615 ReviewerAutoComplete('user');
616 616 // custom code mirror
617 617 var codeMirrorInstance = initPullRequestsCodeMirror('#pr-description-input');
618 618
619 619 var PRDetails = {
620 620 editButton: $('#open_edit_pullrequest'),
621 621 closeButton: $('#close_edit_pullrequest'),
622 622 deleteButton: $('#delete_pullrequest'),
623 623 viewFields: $('#pr-desc, #pr-title'),
624 624 editFields: $('#pr-desc-edit, #pr-title-edit, #pr-save'),
625 625
626 626 init: function() {
627 627 var that = this;
628 628 this.editButton.on('click', function(e) { that.edit(); });
629 629 this.closeButton.on('click', function(e) { that.view(); });
630 630 },
631 631
632 632 edit: function(event) {
633 633 this.viewFields.hide();
634 634 this.editButton.hide();
635 635 this.deleteButton.hide();
636 636 this.closeButton.show();
637 637 this.editFields.show();
638 638 codeMirrorInstance.refresh();
639 639 },
640 640
641 641 view: function(event) {
642 642 this.editButton.show();
643 643 this.deleteButton.show();
644 644 this.editFields.hide();
645 645 this.closeButton.hide();
646 646 this.viewFields.show();
647 647 }
648 648 };
649 649
650 650 var ReviewersPanel = {
651 651 editButton: $('#open_edit_reviewers'),
652 652 closeButton: $('#close_edit_reviewers'),
653 653 addButton: $('#add_reviewer_input'),
654 654 removeButtons: $('.reviewer_member_remove'),
655 655
656 656 init: function() {
657 657 var that = this;
658 658 this.editButton.on('click', function(e) { that.edit(); });
659 659 this.closeButton.on('click', function(e) { that.close(); });
660 660 },
661 661
662 662 edit: function(event) {
663 663 this.editButton.hide();
664 664 this.closeButton.show();
665 665 this.addButton.show();
666 666 this.removeButtons.css('visibility', 'visible');
667 667 },
668 668
669 669 close: function(event) {
670 670 this.editButton.show();
671 671 this.closeButton.hide();
672 672 this.addButton.hide();
673 673 this.removeButtons.css('visibility', 'hidden');
674 674 }
675 675 };
676 676
677 677 PRDetails.init();
678 678 ReviewersPanel.init();
679 679
680 680 showOutdated = function(self){
681 681 $('.comment-inline.comment-outdated').show();
682 682 $('.filediff-outdated').show();
683 683 $('.showOutdatedComments').hide();
684 684 $('.hideOutdatedComments').show();
685 685 };
686 686
687 687 hideOutdated = function(self){
688 688 $('.comment-inline.comment-outdated').hide();
689 689 $('.filediff-outdated').hide();
690 690 $('.hideOutdatedComments').hide();
691 691 $('.showOutdatedComments').show();
692 692 };
693 693
694 694 refreshMergeChecks = function(){
695 695 var loadUrl = "${h.url.current(merge_checks=1)}";
696 696 $('.pull-request-merge').css('opacity', 0.3);
697 697 $('.action-buttons-extra').css('opacity', 0.3);
698 698
699 699 $('.pull-request-merge').load(
700 700 loadUrl, function() {
701 701 $('.pull-request-merge').css('opacity', 1);
702 702
703 703 $('.action-buttons-extra').css('opacity', 1);
704 704 injectCloseAction();
705 705 }
706 706 );
707 707 };
708 708
709 709 injectCloseAction = function() {
710 710 var closeAction = $('#close-pull-request-action').html();
711 711 var $actionButtons = $('.action-buttons-extra');
712 712 // clear the action before
713 713 $actionButtons.html("");
714 714 $actionButtons.html(closeAction);
715 715 };
716 716
717 717 closePullRequest = function (status) {
718 718 // inject closing flag
719 719 $('.action-buttons-extra').append('<input type="hidden" class="close-pr-input" id="close_pull_request" value="1">');
720 720 $(generalCommentForm.statusChange).select2("val", status).trigger('change');
721 721 $(generalCommentForm.submitForm).submit();
722 722 };
723 723
724 724 $('#show-outdated-comments').on('click', function(e){
725 725 var button = $(this);
726 726 var outdated = $('.comment-outdated');
727 727
728 728 if (button.html() === "(Show)") {
729 729 button.html("(Hide)");
730 730 outdated.show();
731 731 } else {
732 732 button.html("(Show)");
733 733 outdated.hide();
734 734 }
735 735 });
736 736
737 737 $('.show-inline-comments').on('change', function(e){
738 738 var show = 'none';
739 739 var target = e.currentTarget;
740 740 if(target.checked){
741 741 show = ''
742 742 }
743 743 var boxid = $(target).attr('id_for');
744 744 var comments = $('#{0} .inline-comments'.format(boxid));
745 745 var fn_display = function(idx){
746 746 $(this).css('display', show);
747 747 };
748 748 $(comments).each(fn_display);
749 749 var btns = $('#{0} .inline-comments-button'.format(boxid));
750 750 $(btns).each(fn_display);
751 751 });
752 752
753 753 $('#merge_pull_request_form').submit(function() {
754 754 if (!$('#merge_pull_request').attr('disabled')) {
755 755 $('#merge_pull_request').attr('disabled', 'disabled');
756 756 }
757 757 return true;
758 758 });
759 759
760 760 $('#edit_pull_request').on('click', function(e){
761 761 var title = $('#pr-title-input').val();
762 762 var description = codeMirrorInstance.getValue();
763 763 editPullRequest(
764 764 "${c.repo_name}", "${c.pull_request.pull_request_id}",
765 765 title, description);
766 766 });
767 767
768 768 $('#update_pull_request').on('click', function(e){
769 769 updateReviewers(undefined, "${c.repo_name}", "${c.pull_request.pull_request_id}");
770 770 });
771 771
772 772 $('#update_commits').on('click', function(e){
773 773 var isDisabled = !$(e.currentTarget).attr('disabled');
774 774 $(e.currentTarget).text(_gettext('Updating...'));
775 775 $(e.currentTarget).attr('disabled', 'disabled');
776 776 if(isDisabled){
777 777 updateCommits("${c.repo_name}", "${c.pull_request.pull_request_id}");
778 778 }
779 779
780 780 });
781 781 // fixing issue with caches on firefox
782 782 $('#update_commits').removeAttr("disabled");
783 783
784 784 $('#close_pull_request').on('click', function(e){
785 785 closePullRequest("${c.repo_name}", "${c.pull_request.pull_request_id}");
786 786 });
787 787
788 788 $('.show-inline-comments').on('click', function(e){
789 789 var boxid = $(this).attr('data-comment-id');
790 790 var button = $(this);
791 791
792 792 if(button.hasClass("comments-visible")) {
793 793 $('#{0} .inline-comments'.format(boxid)).each(function(index){
794 794 $(this).hide();
795 795 });
796 796 button.removeClass("comments-visible");
797 797 } else {
798 798 $('#{0} .inline-comments'.format(boxid)).each(function(index){
799 799 $(this).show();
800 800 });
801 801 button.addClass("comments-visible");
802 802 }
803 803 });
804 804
805 805 // register submit callback on commentForm form to track TODOs
806 806 window.commentFormGlobalSubmitSuccessCallback = function(){
807 807 refreshMergeChecks();
808 808 };
809 809 // initial injection
810 810 injectCloseAction();
811 811
812 812 })
813 813 </script>
814 814
815 815 </div>
816 816 </div>
817 817
818 818 </%def>
General Comments 0
You need to be logged in to leave comments. Login now