Mercurial > kallithea

annotate rhodecode/templates/pullrequests/pullrequest_show.html @ 3609:2ea981f9da79 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templates: enforce more consistency by being less flexible in templates All pages must define page_nav. context_bar may only be used on relevant repository pages, and the 'current' parameter is mandatory.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 26 Mar 2013 23:21:40 +0100
parents bb1eecda3172
children 8a8a559eaf95
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2434
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
1 <%inherit file="/base/base.html"/>
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
2
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
3 <%def name="title()">
3582
1f334a68d057 improved title consistency
Marcin Kuzminski <marcin@python-works.com>
parents: 3580
diff changeset
4 ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)} &middot; ${c.rhodecode_name}
2434
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
5 </%def>
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
6
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
7 <%def name="breadcrumbs_links()">
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
8 ${_('Pull request #%s') % c.pull_request.pull_request_id}
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
9 </%def>
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
10
3609
2ea981f9da79 templates: enforce more consistency by being less flexible in templates
Mads Kiilerich <madski@unity3d.com>
parents: 3602
diff changeset
11 <%def name="page_nav()">
2ea981f9da79 templates: enforce more consistency by being less flexible in templates
Mads Kiilerich <madski@unity3d.com>
parents: 3602
diff changeset
12 ${self.menu('repositories')}
2ea981f9da79 templates: enforce more consistency by being less flexible in templates
Mads Kiilerich <madski@unity3d.com>
parents: 3602
diff changeset
13 </%def>
2ea981f9da79 templates: enforce more consistency by being less flexible in templates
Mads Kiilerich <madski@unity3d.com>
parents: 3602
diff changeset
14
2434
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
15 <%def name="main()">
3580
7b9d4f6bb04e show only open pull requests in the counter, and use repo context bar in pull requests view
Marcin Kuzminski <marcin@python-works.com>
parents: 3516
diff changeset
16 ${self.context_bar('showpullrequest')}
2434
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
17 <div class="box">
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
18 <!-- box / title -->
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
19 <div class="title">
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
20 ${self.breadcrumbs()}
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
21 </div>
2608
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2492
diff changeset
22 %if c.pull_request.is_closed():
2803
0b2214604c74 Fixed status of changesets in preview windows
Marcin Kuzminski <marcin@python-works.com>
parents: 2770
diff changeset
23 <div style="padding:10px; font-size:22px;width:100%;text-align: center; color:#88D882">${_('Closed %s') % (h.age(c.pull_request.updated_on))} ${_('with status %s') % h.changeset_status_lbl(c.current_changeset_status)}</div>
2673
d5e42c00f3c1 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2654
diff changeset
24 %endif
3402
58737dee17f1 show pull request status, together with review status
Marcin Kuzminski <marcin@python-works.com>
parents: 3394
diff changeset
25 <h3>
58737dee17f1 show pull request status, together with review status
Marcin Kuzminski <marcin@python-works.com>
parents: 3394
diff changeset
26 %if c.pull_request.is_closed():
58737dee17f1 show pull request status, together with review status
Marcin Kuzminski <marcin@python-works.com>
parents: 3394
diff changeset
27 <img src="${h.url('/images/icons/lock_go.png')}" title="${_('Closed')}"/>
58737dee17f1 show pull request status, together with review status
Marcin Kuzminski <marcin@python-works.com>
parents: 3394
diff changeset
28 %endif
3413
d79f3505549e whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3402
diff changeset
29 <img src="${h.url('/images/icons/flag_status_%s.png' % str(c.pull_request.last_review_status))}" />
3402
58737dee17f1 show pull request status, together with review status
Marcin Kuzminski <marcin@python-works.com>
parents: 3394
diff changeset
30 ${_('Title')}: ${c.pull_request.title}</h3>
2815
acc05c33cc0c White space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2803
diff changeset
31
2712
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
32 <div class="form">
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
33 <div id="summary" class="fields">
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
34 <div class="field">
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
35 <div class="label-summary">
3388
cb40b3f6428c review members are dynamically changed based on selected other_repo owner
Marcin Kuzminski <marcin@python-works.com>
parents: 3312
diff changeset
36 <label>${_('Review status')}:</label>
2712
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
37 </div>
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
38 <div class="input">
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
39 <div class="changeset-status-container" style="float:none;clear:both">
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
40 %if c.current_changeset_status:
3253
c3e471704838 pull requests: drop [] around status
Mads Kiilerich <madski@unity3d.com>
parents: 3252
diff changeset
41 <div title="${_('Pull request status')}" class="changeset-status-lbl">${h.changeset_status_lbl(c.current_changeset_status)}</div>
2712
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
42 <div class="changeset-status-ico" style="padding:1px 4px"><img src="${h.url('/images/icons/flag_status_%s.png' % c.current_changeset_status)}" /></div>
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
43 %endif
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
44 </div>
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
45 </div>
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
46 </div>
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
47 <div class="field">
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
48 <div class="label-summary">
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
49 <label>${_('Still not reviewed by')}:</label>
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
50 </div>
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
51 <div class="input">
2883
b1822f4a85ca Show that all reviewers reviewed pull request
Marcin Kuzminski <marcin@python-works.com>
parents: 2815
diff changeset
52 % if len(c.pull_request_pending_reviewers) > 0:
b1822f4a85ca Show that all reviewers reviewed pull request
Marcin Kuzminski <marcin@python-works.com>
parents: 2815
diff changeset
53 <div class="tooltip" title="${h.tooltip(','.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>
b1822f4a85ca Show that all reviewers reviewed pull request
Marcin Kuzminski <marcin@python-works.com>
parents: 2815
diff changeset
54 %else:
2907
0b86972de820 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2883
diff changeset
55 <div>${_('pull request was reviewed by all reviewers')}</div>
2883
b1822f4a85ca Show that all reviewers reviewed pull request
Marcin Kuzminski <marcin@python-works.com>
parents: 2815
diff changeset
56 %endif
2712
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
57 </div>
2815
acc05c33cc0c White space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2803
diff changeset
58 </div>
3170
2ab2eed4a70a implemented #725 Pull Request View - Show origin repo URL
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
59 <div class="field">
2ab2eed4a70a implemented #725 Pull Request View - Show origin repo URL
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
60 <div class="label-summary">
2ab2eed4a70a implemented #725 Pull Request View - Show origin repo URL
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
61 <label>${_('Origin repository')}:</label>
2ab2eed4a70a implemented #725 Pull Request View - Show origin repo URL
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
62 </div>
2ab2eed4a70a implemented #725 Pull Request View - Show origin repo URL
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
63 <div class="input">
2ab2eed4a70a implemented #725 Pull Request View - Show origin repo URL
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
64 <div>
2ab2eed4a70a implemented #725 Pull Request View - Show origin repo URL
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
65 ##%if h.is_hg(c.pull_request.org_repo):
2ab2eed4a70a implemented #725 Pull Request View - Show origin repo URL
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
66 ## <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/>
2ab2eed4a70a implemented #725 Pull Request View - Show origin repo URL
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
67 ##%elif h.is_git(c.pull_request.org_repo):
2ab2eed4a70a implemented #725 Pull Request View - Show origin repo URL
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
68 ## <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/>
2ab2eed4a70a implemented #725 Pull Request View - Show origin repo URL
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
69 ##%endif
3252
cd2aa3a36d76 pull requests: don't show the branch label as a (double) tag
Mads Kiilerich <madski@unity3d.com>
parents: 3248
diff changeset
70 <span class="spantag">${c.pull_request.org_ref_parts[0]}: ${c.pull_request.org_ref_parts[1]}</span>
3216
81bbb8086f03 whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3197
diff changeset
71 <span><a href="${h.url('summary_home', repo_name=c.pull_request.org_repo.repo_name)}">${c.pull_request.org_repo.clone_url()}</a></span>
3170
2ab2eed4a70a implemented #725 Pull Request View - Show origin repo URL
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
72 </div>
2ab2eed4a70a implemented #725 Pull Request View - Show origin repo URL
Marcin Kuzminski <marcin@python-works.com>
parents: 3149
diff changeset
73 </div>
3216
81bbb8086f03 whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3197
diff changeset
74 </div>
3248
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
75 <div class="field">
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
76 <div class="label-summary">
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
77 <label>${_('Summary')}:</label>
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
78 </div>
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
79 <div class="input">
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
80 <div style="white-space:pre-wrap">${h.literal(c.pull_request.description)}</div>
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
81 </div>
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
82 </div>
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
83 <div class="field">
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
84 <div class="label-summary">
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
85 <label>${_('Created on')}:</label>
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
86 </div>
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
87 <div class="input">
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
88 <div>${h.fmt_date(c.pull_request.created_on)}</div>
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
89 </div>
0dfe7eaf21cb pull request: show summary and creation date in table
Mads Kiilerich <madski@unity3d.com>
parents: 3229
diff changeset
90 </div>
2712
7224882c4059 new summary for opened pull requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2673
diff changeset
91 </div>
2815
acc05c33cc0c White space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2803
diff changeset
92 </div>
2478
8eab81115660 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2443
diff changeset
93
3023
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
94 <div style="overflow: auto;">
2481
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
95 ##DIFF
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
96 <div class="table" style="float:left;clear:none">
2481
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
97 <div id="body" class="diffblock">
2482
1fd3c043c025 small UI changes for pull-request view
Marcin Kuzminski <marcin@python-works.com>
parents: 2481
diff changeset
98 <div style="white-space:pre-wrap;padding:5px">${_('Compare view')}</div>
2481
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
99 </div>
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
100 <div id="changeset_compare_view_content">
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
101 ##CS
3023
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
102 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>
2481
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
103 <%include file="/compare/compare_cs.html" />
3029
685ebc84c2e9 White space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3023
diff changeset
104
2481
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
105 ## FILES
3023
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
106 <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
3029
685ebc84c2e9 White space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3023
diff changeset
107
3023
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
108 % if c.limited_diff:
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
109 ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
110 % else:
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
111 ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
112 %endif
3029
685ebc84c2e9 White space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3023
diff changeset
113
3023
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
114 </div>
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
115 <div class="cs_files">
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
116 %if not c.files:
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
117 <span class="empty_data">${_('No files')}</span>
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
118 %endif
2481
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
119 %for fid, change, f, stat in c.files:
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
120 <div class="cs_${change}">
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
121 <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div>
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
122 <div class="changes">${h.fancy_file_stats(stat)}</div>
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
123 </div>
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
124 %endfor
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
125 </div>
3023
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
126 % if c.limited_diff:
3312
1af36014d96f show full diff option should preserve current GET params
Marcin Kuzminski <marcin@python-works.com>
parents: 3266
diff changeset
127 <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h5>
3029
685ebc84c2e9 White space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3023
diff changeset
128 % endif
2481
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
129 </div>
4d3032431d4f Adde pull request voting recalculation
Marcin Kuzminski <marcin@python-works.com>
parents: 2478
diff changeset
130 </div>
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
131 ## REVIEWERS
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
132 <div style="float:left; border-left:1px dashed #eee">
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
133 <h4>${_('Pull request reviewers')}</h4>
3023
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
134 <div id="reviewers" style="padding:0px 0px 5px 10px">
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
135 ## members goes here !
3023
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
136 <div class="group_members_wrap" style="min-height:45px">
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
137 <ul id="review_members" class="group_members">
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
138 %for member,status in c.pull_request_reviewers:
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
139 <li id="reviewer_${member.user_id}">
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
140 <div class="reviewers_member">
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
141 <div style="float:left;padding:0px 3px 0px 0px" class="tooltip" title="${h.tooltip(h.changeset_status_lbl(status[0][1].status if status else 'not_reviewed'))}">
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
142 <img src="${h.url(str('/images/icons/flag_status_%s.png' % (status[0][1].status if status else 'not_reviewed')))}"/>
2673
d5e42c00f3c1 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2654
diff changeset
143 </div>
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
144 <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div>
3105
706b9f84ade3 fixed labels in reviewers list
Marcin Kuzminski <marcin@python-works.com>
parents: 3104
diff changeset
145 <div style="float:left">${member.full_name} (${_('owner') if c.pull_request.user_id == member.user_id else _('reviewer')})</div>
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
146 <input type="hidden" value="${member.user_id}" name="review_members" />
3105
706b9f84ade3 fixed labels in reviewers list
Marcin Kuzminski <marcin@python-works.com>
parents: 3104
diff changeset
147 %if not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin', 'repository.admin')() or c.pull_request.user_id == c.rhodecode_user.user_id):
3388
cb40b3f6428c review members are dynamically changed based on selected other_repo owner
Marcin Kuzminski <marcin@python-works.com>
parents: 3312
diff changeset
148 <span class="delete_icon action_button" onclick="removeReviewMember(${member.user_id})"></span>
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
149 %endif
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
150 </div>
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
151 </li>
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
152 %endfor
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
153 </ul>
2673
d5e42c00f3c1 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2654
diff changeset
154 </div>
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
155 %if not c.pull_request.is_closed():
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
156 <div class='ac'>
2770
74364824c1e1 Hide add/delete pull request members when you don't have permission for it
Marcin Kuzminski <marcin@python-works.com>
parents: 2713
diff changeset
157 %if h.HasPermissionAny('hg.admin', 'repository.admin')() or c.pull_request.author.user_id == c.rhodecode_user.user_id:
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
158 <div class="reviewer_ac">
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
159 ${h.text('user', class_='yui-ac-input')}
3388
cb40b3f6428c review members are dynamically changed based on selected other_repo owner
Marcin Kuzminski <marcin@python-works.com>
parents: 3312
diff changeset
160 <span class="help-block">${_('Add or remove reviewer to this pull request.')}</span>
2673
d5e42c00f3c1 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2654
diff changeset
161 <div id="reviewers_container"></div>
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
162 </div>
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
163 <div style="padding:0px 10px">
3516
c44645e5a836 fix casings
Mads Kiilerich <madski@unity3d.com>
parents: 3413
diff changeset
164 <span id="update_pull_request" class="ui-btn xsmall">${_('Save changes')}</span>
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
165 </div>
2770
74364824c1e1 Hide add/delete pull request members when you don't have permission for it
Marcin Kuzminski <marcin@python-works.com>
parents: 2713
diff changeset
166 %endif
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
167 </div>
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
168 %endif
2673
d5e42c00f3c1 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2654
diff changeset
169 </div>
d5e42c00f3c1 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2654
diff changeset
170 </div>
2440
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
171 </div>
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
172 <script>
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
173 var _USERS_AC_DATA = ${c.users_array|n};
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
174 var _GROUPS_AC_DATA = ${c.users_groups_array|n};
3388
cb40b3f6428c review members are dynamically changed based on selected other_repo owner
Marcin Kuzminski <marcin@python-works.com>
parents: 3312
diff changeset
175 // TODO: switch this to pyroutes
2489
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
176 AJAX_COMMENT_URL = "${url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}";
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
177 AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
3388
cb40b3f6428c review members are dynamically changed based on selected other_repo owner
Marcin Kuzminski <marcin@python-works.com>
parents: 3312
diff changeset
178
cb40b3f6428c review members are dynamically changed based on selected other_repo owner
Marcin Kuzminski <marcin@python-works.com>
parents: 3312
diff changeset
179 pyroutes.register('pullrequest_comment', "${url('pullrequest_comment',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);
cb40b3f6428c review members are dynamically changed based on selected other_repo owner
Marcin Kuzminski <marcin@python-works.com>
parents: 3312
diff changeset
180 pyroutes.register('pullrequest_comment_delete', "${url('pullrequest_comment_delete',repo_name='%(repo_name)s',comment_id='%(comment_id)s')}", ['repo_name', 'comment_id']);
cb40b3f6428c review members are dynamically changed based on selected other_repo owner
Marcin Kuzminski <marcin@python-works.com>
parents: 3312
diff changeset
181 pyroutes.register('pullrequest_update', "${url('pullrequest_update',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);
3394
fe2bb88bf7ac whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3388
diff changeset
182
2440
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
183 </script>
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
184
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
185 ## diff block
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
186 <%namespace name="diff_block" file="/changeset/diff_block.html"/>
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
187 %for fid, change, f, stat in c.files:
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
188 ${diff_block.diff_block_simple([c.changes[fid]])}
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
189 %endfor
3023
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
190 % if c.limited_diff:
3312
1af36014d96f show full diff option should preserve current GET params
Marcin Kuzminski <marcin@python-works.com>
parents: 3266
diff changeset
191 <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h4>
3023
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
192 % endif
c2a206162062 Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents: 2973
diff changeset
193
2440
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
194
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
195 ## template for inline comment form
1bc579bcd67a - pull request generates overview based on it's params
Marcin Kuzminski <marcin@python-works.com>
parents: 2434
diff changeset
196 <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
2489
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
197 ${comment.comment_inline_form()}
2673
d5e42c00f3c1 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2654
diff changeset
198
2608
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2492
diff changeset
199 ## render comments and inlines
3229
aad51f79d040 added a flag for generating pull-request comments, and force display on pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 3216
diff changeset
200 ${comment.generate_comments(include_pr=True)}
2673
d5e42c00f3c1 white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 2654
diff changeset
201
2608
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2492
diff changeset
202 % if not c.pull_request.is_closed():
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2492
diff changeset
203 ## main comment form and it status
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2492
diff changeset
204 ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2492
diff changeset
205 pull_request_id=c.pull_request.pull_request_id),
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2492
diff changeset
206 c.current_changeset_status,
3104
c77d5c6358eb Implemented #670 Implementation of Roles in Pull Request
Marcin Kuzminski <marcin@python-works.com>
parents: 3029
diff changeset
207 close_btn=True, change_status=c.allowed_to_change_status)}
2608
58c529332e7e Added option to close pull requests, in future that will be close & merge
Marcin Kuzminski <marcin@python-works.com>
parents: 2492
diff changeset
208 %endif
2489
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
209
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
210 <script type="text/javascript">
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
211 YUE.onDOMReady(function(){
3197
b4f401524060 html: don't use tabs
Mads Kiilerich <madski@unity3d.com>
parents: 3175
diff changeset
212 PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
2489
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
213
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
214 YUE.on(YUQ('.show-inline-comments'),'change',function(e){
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
215 var show = 'none';
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
216 var target = e.currentTarget;
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
217 if(target.checked){
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
218 var show = ''
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
219 }
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
220 var boxid = YUD.getAttribute(target,'id_for');
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
221 var comments = YUQ('#{0} .inline-comments'.format(boxid));
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
222 for(c in comments){
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
223 YUD.setStyle(comments[c],'display',show);
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
224 }
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
225 var btns = YUQ('#{0} .inline-comments-button'.format(boxid));
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
226 for(c in btns){
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
227 YUD.setStyle(btns[c],'display',show);
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
228 }
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
229 })
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
230
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
231 YUE.on(YUQ('.line'),'click',function(e){
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
232 var tr = e.currentTarget;
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
233 injectInlineForm(tr);
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
234 });
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
235
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
236 // inject comments into they proper positions
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
237 var file_comments = YUQ('.inline-comment-placeholder');
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
238 renderInlineComments(file_comments);
3149
68f9c216377d white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents: 3106
diff changeset
239
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
240 YUE.on(YUD.get('update_pull_request'),'click',function(e){
3388
cb40b3f6428c review members are dynamically changed based on selected other_repo owner
Marcin Kuzminski <marcin@python-works.com>
parents: 3312
diff changeset
241 updateReviewers(undefined, "${c.repo_name}", "${c.pull_request.pull_request_id}");
2614
3f50a5e8fc4d Added editing of pull-request reviewers.
Marcin Kuzminski <marcin@python-works.com>
parents: 2608
diff changeset
242 })
2489
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
243 })
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
244 </script>
a0adf8db1416 Enabled inline comments in pull-requests
Marcin Kuzminski <marcin@python-works.com>
parents: 2482
diff changeset
245
2434
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
246 </div>
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
247
f29469677319 Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
248 </%def>