Mercurial > kallithea
annotate rhodecode/templates/pullrequests/pullrequest.html @ 3380:01fe360a66c0 beta
fixed pull-requests with cherry picking changesets
- fixed tests for them
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 19 Feb 2013 01:57:59 +0100 |
parents | cfc0fef66ddd |
children | cb40b3f6428c |
rev | line source |
---|---|
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
1 <%inherit file="/base/base.html"/> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
2 |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
3 <%def name="title()"> |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
4 ${c.repo_name} ${_('New pull request')} |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
5 </%def> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
6 |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
7 <%def name="breadcrumbs_links()"> |
2492
79818f546538
i18n 'Home' in breadcrumbs
Takumi IINO <trot.thunder@gmail.com>
parents:
2434
diff
changeset
|
8 ${h.link_to(_(u'Home'),h.url('/'))} |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
9 » |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
10 ${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))} |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
11 » |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
12 ${_('New pull request')} |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
13 </%def> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
14 |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
15 <%def name="main()"> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
16 |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
17 <div class="box"> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
18 <!-- box / title --> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
19 <div class="title"> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
20 ${self.breadcrumbs()} |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
21 </div> |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
22 ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')} |
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
23 <div style="float:left;padding:0px 30px 30px 30px"> |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
2907
diff
changeset
|
24 <input type="hidden" name="rev_start" value="${request.GET.get('rev_start')}" /> |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
2907
diff
changeset
|
25 <input type="hidden" name="rev_end" value="${request.GET.get('rev_end')}" /> |
3029
685ebc84c2e9
White space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
3023
diff
changeset
|
26 |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
27 ##ORG |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
28 <div style="float:left"> |
3330
dcd1c159a132
pull request: don't show fake path with owner names - and owner avatars is also not relevant
Mads Kiilerich <madski@unity3d.com>
parents:
3329
diff
changeset
|
29 <div> |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
30 <span style="font-size: 20px"> |
3329
f8c55b487c9a
pull request: select 'tip' by default ... and show what it means right now
Mads Kiilerich <madski@unity3d.com>
parents:
3327
diff
changeset
|
31 ${h.select('org_repo','',c.org_repos,class_='refs')}:${h.select('org_ref',c.default_org_ref,c.org_refs,class_='refs')} |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
32 </span> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
33 <div style="padding:5px 3px 3px 42px;">${c.rhodecode_db_repo.description}</div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
34 </div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
35 <div style="clear:both;padding-top: 10px"></div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
36 </div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
37 <div style="float:left;font-size:24px;padding:0px 20px"> |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2244
diff
changeset
|
38 <img height=32 width=32 src="${h.url('/images/arrow_right_64.png')}"/> |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
39 </div> |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
40 |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
41 ##OTHER, most Probably the PARENT OF THIS FORK |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
42 <div style="float:left"> |
3330
dcd1c159a132
pull request: don't show fake path with owner names - and owner avatars is also not relevant
Mads Kiilerich <madski@unity3d.com>
parents:
3329
diff
changeset
|
43 <div> |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
44 <span style="font-size: 20px"> |
3327
f285faa3a602
pull request: move code around and rename default variables
Mads Kiilerich <madski@unity3d.com>
parents:
3326
diff
changeset
|
45 ${h.select('other_repo',c.default_other_repo,c.other_repos,class_='refs')}:${h.select('other_ref',c.default_other_ref,c.default_other_refs,class_='refs')} |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
46 </span> |
2541
1c2ba03c42b4
Added dynamic data loading for other repo we open pull request against
Marcin Kuzminski <marcin@python-works.com>
parents:
2492
diff
changeset
|
47 <div id="other_repo_desc" style="padding:5px 3px 3px 42px;"></div> |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
48 </div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
49 <div style="clear:both;padding-top: 10px"></div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
50 </div> |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
51 <div style="clear:both;padding-top: 10px"></div> |
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
52 ## overview pulled by ajax |
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
53 <div style="float:left" id="pull_request_overview"></div> |
2396
51e3d60fed2f
added link for detailed overview in pull-request form
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
54 <div style="float:left;clear:both;padding:10px 10px 10px 0px;display:none"> |
51e3d60fed2f
added link for detailed overview in pull-request form
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
55 <a id="pull_request_overview_url" href="#">${_('Detailed compare view')}</a> |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
56 </div> |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
57 </div> |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2244
diff
changeset
|
58 <div style="float:left; border-left:1px dashed #eee"> |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2244
diff
changeset
|
59 <h4>${_('Pull request reviewers')}</h4> |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2244
diff
changeset
|
60 <div id="reviewers" style="padding:0px 0px 0px 15px"> |
2612
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
61 ## members goes here ! |
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
62 <div class="group_members_wrap"> |
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
63 <ul id="review_members" class="group_members"> |
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
64 %for member in c.review_members: |
2613
ad3573d744ef
added option to remove members added using autocomplete widget from pull
Marcin Kuzminski <marcin@python-works.com>
parents:
2612
diff
changeset
|
65 <li id="reviewer_${member.user_id}"> |
ad3573d744ef
added option to remove members added using autocomplete widget from pull
Marcin Kuzminski <marcin@python-works.com>
parents:
2612
diff
changeset
|
66 <div class="reviewers_member"> |
ad3573d744ef
added option to remove members added using autocomplete widget from pull
Marcin Kuzminski <marcin@python-works.com>
parents:
2612
diff
changeset
|
67 <div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email,14)}"/> </div> |
ad3573d744ef
added option to remove members added using autocomplete widget from pull
Marcin Kuzminski <marcin@python-works.com>
parents:
2612
diff
changeset
|
68 <div style="float:left">${member.full_name} (${_('owner')})</div> |
ad3573d744ef
added option to remove members added using autocomplete widget from pull
Marcin Kuzminski <marcin@python-works.com>
parents:
2612
diff
changeset
|
69 <input type="hidden" value="${member.user_id}" name="review_members" /> |
ad3573d744ef
added option to remove members added using autocomplete widget from pull
Marcin Kuzminski <marcin@python-works.com>
parents:
2612
diff
changeset
|
70 <span class="delete_icon action_button" onclick="removeReviewer(${member.user_id})"></span> |
ad3573d744ef
added option to remove members added using autocomplete widget from pull
Marcin Kuzminski <marcin@python-works.com>
parents:
2612
diff
changeset
|
71 </div> |
ad3573d744ef
added option to remove members added using autocomplete widget from pull
Marcin Kuzminski <marcin@python-works.com>
parents:
2612
diff
changeset
|
72 </li> |
2612
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
73 %endfor |
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
74 </ul> |
2673
d5e42c00f3c1
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2613
diff
changeset
|
75 </div> |
d5e42c00f3c1
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2613
diff
changeset
|
76 |
2612
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
77 <div class='ac'> |
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
78 <div class="reviewer_ac"> |
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
79 ${h.text('user', class_='yui-ac-input')} |
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
80 <span class="help-block">${_('Add reviewer to this pull request.')}</span> |
2673
d5e42c00f3c1
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2613
diff
changeset
|
81 <div id="reviewers_container"></div> |
2612
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
82 </div> |
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
83 </div> |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2244
diff
changeset
|
84 </div> |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
85 </div> |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2244
diff
changeset
|
86 <h3>${_('Create new pull request')}</h3> |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
87 |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
88 <div class="form"> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
89 <!-- fields --> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
90 |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
91 <div class="fields"> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
92 |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
93 <div class="field"> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
94 <div class="label"> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
95 <label for="pullrequest_title">${_('Title')}:</label> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
96 </div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
97 <div class="input"> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
98 ${h.text('pullrequest_title',size=30)} |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
99 </div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
100 </div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
101 |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
102 <div class="field"> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
103 <div class="label label-textarea"> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
104 <label for="pullrequest_desc">${_('description')}:</label> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
105 </div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
106 <div class="textarea text-area editor"> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
107 ${h.textarea('pullrequest_desc',size=30)} |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
108 </div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
109 </div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
110 |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
111 <div class="buttons"> |
2607
7ae36df760ce
removed deprecated ui-button
Marcin Kuzminski <marcin@python-works.com>
parents:
2541
diff
changeset
|
112 ${h.submit('save',_('Send pull request'),class_="ui-btn large")} |
7ae36df760ce
removed deprecated ui-button
Marcin Kuzminski <marcin@python-works.com>
parents:
2541
diff
changeset
|
113 ${h.reset('reset',_('Reset'),class_="ui-btn large")} |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
114 </div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
115 </div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
116 </div> |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
117 ${h.end_form()} |
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
118 |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
119 </div> |
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
120 |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2244
diff
changeset
|
121 <script type="text/javascript"> |
2612
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
122 var _USERS_AC_DATA = ${c.users_array|n}; |
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
123 var _GROUPS_AC_DATA = ${c.users_groups_array|n}; |
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
124 PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA); |
9364776d1331
Added autocomplete widget for pull request reviewers, in exchange of 90s style
Marcin Kuzminski <marcin@python-works.com>
parents:
2607
diff
changeset
|
125 |
2541
1c2ba03c42b4
Added dynamic data loading for other repo we open pull request against
Marcin Kuzminski <marcin@python-works.com>
parents:
2492
diff
changeset
|
126 var other_repos_info = ${c.other_repos_info|n}; |
2907
0b86972de820
white space cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
2892
diff
changeset
|
127 |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2244
diff
changeset
|
128 var loadPreview = function(){ |
3197 | 129 YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none'); |
3321
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
130 //url template |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
131 var url = "${h.url('compare_url', |
3322
c9b0f1d363c7
compare: swap org and other when they refer to different repos, ie are pull request style
Mads Kiilerich <madski@unity3d.com>
parents:
3321
diff
changeset
|
132 repo_name='__other_repo__', |
c9b0f1d363c7
compare: swap org and other when they refer to different repos, ie are pull request style
Mads Kiilerich <madski@unity3d.com>
parents:
3321
diff
changeset
|
133 org_ref_type='__other_ref_type__', |
c9b0f1d363c7
compare: swap org and other when they refer to different repos, ie are pull request style
Mads Kiilerich <madski@unity3d.com>
parents:
3321
diff
changeset
|
134 org_ref='__other_ref__', |
c9b0f1d363c7
compare: swap org and other when they refer to different repos, ie are pull request style
Mads Kiilerich <madski@unity3d.com>
parents:
3321
diff
changeset
|
135 other_repo='__org_repo__', |
c9b0f1d363c7
compare: swap org and other when they refer to different repos, ie are pull request style
Mads Kiilerich <madski@unity3d.com>
parents:
3321
diff
changeset
|
136 other_ref_type='__org_ref_type__', |
c9b0f1d363c7
compare: swap org and other when they refer to different repos, ie are pull request style
Mads Kiilerich <madski@unity3d.com>
parents:
3321
diff
changeset
|
137 other_ref='__org_ref__', |
3304
70309536c143
compare and diff: remove unused "bundle" functionality
Mads Kiilerich <madski@unity3d.com>
parents:
3197
diff
changeset
|
138 as_form=True, |
3023
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
2907
diff
changeset
|
139 rev_start=request.GET.get('rev_start',''), |
c2a206162062
Basic implementation of cherry picking changesets
Marcin Kuzminski <marcin@python-works.com>
parents:
2907
diff
changeset
|
140 rev_end=request.GET.get('rev_end',''))}"; |
3321
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
141 var org_repo = YUQ('#pull_request_form #org_repo')[0].value; |
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
142 var org_ref = YUQ('#pull_request_form #org_ref')[0].value.split(':'); |
3338
cfc0fef66ddd
whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
3330
diff
changeset
|
143 |
3321
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
144 var other_repo = YUQ('#pull_request_form #other_repo')[0].value; |
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
145 var other_ref = YUQ('#pull_request_form #other_ref')[0].value.split(':'); |
3338
cfc0fef66ddd
whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
3330
diff
changeset
|
146 |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2244
diff
changeset
|
147 var select_refs = YUQ('#pull_request_form select.refs') |
3321
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
148 var rev_data = { |
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
149 'org_repo': org_repo, |
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
150 'org_ref': org_ref[1], |
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
151 'org_ref_type': org_ref[0], |
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
152 'other_repo': other_repo, |
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
153 'other_ref': other_ref[1], |
3338
cfc0fef66ddd
whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
3330
diff
changeset
|
154 'other_ref_type': other_ref[0], |
3321
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
155 }; // gather the org/other ref and repo here |
3338
cfc0fef66ddd
whitespace cleanup
Marcin Kuzminski <marcin@python-works.com>
parents:
3330
diff
changeset
|
156 |
3321
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
157 for (k in rev_data){ |
a91fa221a3b8
be more explicit about constructing compare url
Marcin Kuzminski <marcin@python-works.com>
parents:
3317
diff
changeset
|
158 url = url.replace('__'+k+'__',rev_data[k]); |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2244
diff
changeset
|
159 } |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
160 |
2396
51e3d60fed2f
added link for detailed overview in pull-request form
Marcin Kuzminski <marcin@python-works.com>
parents:
2395
diff
changeset
|
161 ypjax(url,'pull_request_overview', function(data){ |
3197 | 162 var sel_box = YUQ('#pull_request_form #other_repo')[0]; |
163 var repo_name = sel_box.options[sel_box.selectedIndex].value; | |
164 YUD.get('pull_request_overview_url').href = url; | |
165 YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display',''); | |
166 YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description']; | |
167 YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs']; | |
168 // select back the revision that was just compared | |
169 setSelectValue(YUD.get('other_ref'), rev_data['other_ref']); | |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
170 }) |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2244
diff
changeset
|
171 } |
3325
c5dde6b5e976
pull request: only bind action to other_repo change once
Mads Kiilerich <madski@unity3d.com>
parents:
3322
diff
changeset
|
172 |
3326
5ef64956c385
pull request: update changeset list automatically - remove refresh icon
Mads Kiilerich <madski@unity3d.com>
parents:
3325
diff
changeset
|
173 ## refresh automatically when something changes (org_repo can't change) |
5ef64956c385
pull request: update changeset list automatically - remove refresh icon
Mads Kiilerich <madski@unity3d.com>
parents:
3325
diff
changeset
|
174 |
5ef64956c385
pull request: update changeset list automatically - remove refresh icon
Mads Kiilerich <madski@unity3d.com>
parents:
3325
diff
changeset
|
175 YUE.on('org_ref', 'change', function(e){ |
5ef64956c385
pull request: update changeset list automatically - remove refresh icon
Mads Kiilerich <madski@unity3d.com>
parents:
3325
diff
changeset
|
176 loadPreview(); |
5ef64956c385
pull request: update changeset list automatically - remove refresh icon
Mads Kiilerich <madski@unity3d.com>
parents:
3325
diff
changeset
|
177 }); |
5ef64956c385
pull request: update changeset list automatically - remove refresh icon
Mads Kiilerich <madski@unity3d.com>
parents:
3325
diff
changeset
|
178 |
3325
c5dde6b5e976
pull request: only bind action to other_repo change once
Mads Kiilerich <madski@unity3d.com>
parents:
3322
diff
changeset
|
179 YUE.on('other_repo', 'change', function(e){ |
c5dde6b5e976
pull request: only bind action to other_repo change once
Mads Kiilerich <madski@unity3d.com>
parents:
3322
diff
changeset
|
180 var repo_name = e.currentTarget.value; |
c5dde6b5e976
pull request: only bind action to other_repo change once
Mads Kiilerich <madski@unity3d.com>
parents:
3322
diff
changeset
|
181 // replace the <select> of changed repo |
c5dde6b5e976
pull request: only bind action to other_repo change once
Mads Kiilerich <madski@unity3d.com>
parents:
3322
diff
changeset
|
182 YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs']; |
3326
5ef64956c385
pull request: update changeset list automatically - remove refresh icon
Mads Kiilerich <madski@unity3d.com>
parents:
3325
diff
changeset
|
183 loadPreview(); |
3325
c5dde6b5e976
pull request: only bind action to other_repo change once
Mads Kiilerich <madski@unity3d.com>
parents:
3322
diff
changeset
|
184 }); |
c5dde6b5e976
pull request: only bind action to other_repo change once
Mads Kiilerich <madski@unity3d.com>
parents:
3322
diff
changeset
|
185 |
3326
5ef64956c385
pull request: update changeset list automatically - remove refresh icon
Mads Kiilerich <madski@unity3d.com>
parents:
3325
diff
changeset
|
186 YUE.on('other_ref', 'change', function(e){ |
5ef64956c385
pull request: update changeset list automatically - remove refresh icon
Mads Kiilerich <madski@unity3d.com>
parents:
3325
diff
changeset
|
187 loadPreview(); |
5ef64956c385
pull request: update changeset list automatically - remove refresh icon
Mads Kiilerich <madski@unity3d.com>
parents:
3325
diff
changeset
|
188 }); |
2434
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
189 |
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
190 //lazy load overview after 0.5s |
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
191 setTimeout(loadPreview, 500) |
f29469677319
Added basic models for saving open pull requests
Marcin Kuzminski <marcin@python-works.com>
parents:
2396
diff
changeset
|
192 |
2395
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2244
diff
changeset
|
193 </script> |
b262e349a7a5
created pull-request overview
Marcin Kuzminski <marcin@python-works.com>
parents:
2244
diff
changeset
|
194 |
2244
77e376fdc4c6
pull requests draft UI
Marcin Kuzminski <marcin@python-works.com>
parents:
diff
changeset
|
195 </%def> |