Files
@ dbd2f2891585
Branch filter:
Location: kallithea/kallithea/templates/pullrequests/pullrequest.html - annotation
dbd2f2891585
10.0 KiB
text/html
pull requests: abort pending ajax requests before starting new one
Quick navigation and different load times could cause an old result to
overwrite a new one.
Quick navigation and different load times could cause an old result to
overwrite a new one.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 | d1addaf7a91e d1addaf7a91e d1addaf7a91e dacdea9fda2a d1addaf7a91e d1addaf7a91e d1addaf7a91e dacdea9fda2a d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e 486cd40776c2 d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e 486cd40776c2 d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e 296b37f6fcdc d1addaf7a91e 29aa65c9638d 6cb077e99873 29aa65c9638d 29aa65c9638d 29aa65c9638d 29aa65c9638d d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e 296b37f6fcdc 6cb077e99873 d1addaf7a91e 29aa65c9638d 6cb077e99873 29aa65c9638d 29aa65c9638d 29aa65c9638d 29aa65c9638d d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e bf011c9f7f58 d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e dacdea9fda2a d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e 6cb077e99873 296b37f6fcdc d1addaf7a91e 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc dcf7fe7a8e9a 52f69be09fe1 d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e 486cd40776c2 d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e 67d5afe2fa1a d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e 296b37f6fcdc d1addaf7a91e dbd2f2891585 d1addaf7a91e 296b37f6fcdc dbd2f2891585 dbd2f2891585 dbd2f2891585 dbd2f2891585 dbd2f2891585 296b37f6fcdc dbd2f2891585 296b37f6fcdc 296b37f6fcdc d1addaf7a91e 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 44ae84b422ad 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc b3f12c354e87 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e c2e3923eebe4 c2e3923eebe4 d1addaf7a91e c2e3923eebe4 c2e3923eebe4 d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e 29aa65c9638d 29aa65c9638d d1addaf7a91e d1addaf7a91e d1addaf7a91e 29aa65c9638d d1addaf7a91e d1addaf7a91e d1addaf7a91e c2e3923eebe4 c2e3923eebe4 c2e3923eebe4 b3f12c354e87 d1addaf7a91e d1addaf7a91e d1addaf7a91e c2e3923eebe4 d1addaf7a91e d1addaf7a91e dbd2f2891585 dbd2f2891585 dbd2f2891585 dbd2f2891585 dbd2f2891585 dbd2f2891585 155f281be5f8 67d5afe2fa1a 67d5afe2fa1a 67d5afe2fa1a d1addaf7a91e d1addaf7a91e e271a8766951 cc5300a1f2ac b3f12c354e87 cc5300a1f2ac cc5300a1f2ac cc5300a1f2ac cc5300a1f2ac b3f12c354e87 cc5300a1f2ac cc5300a1f2ac cc5300a1f2ac cc5300a1f2ac d1addaf7a91e cc5300a1f2ac b3f12c354e87 cc5300a1f2ac cc5300a1f2ac cc5300a1f2ac 296b37f6fcdc 296b37f6fcdc 296b37f6fcdc b3f12c354e87 296b37f6fcdc 296b37f6fcdc cc5300a1f2ac cc5300a1f2ac d1addaf7a91e cc5300a1f2ac cc5300a1f2ac d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e d1addaf7a91e | <%inherit file="/base/base.html"/>
<%def name="title()">
${c.repo_name} ${_('New Pull Request')}
</%def>
<%def name="breadcrumbs_links()">
${_('New Pull Request')}
</%def>
<%def name="page_nav()">
${self.menu('repositories')}
</%def>
<%def name="main()">
${self.repo_context_bar('showpullrequest')}
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
</div>
${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}
<div class="form">
<!-- fields -->
<div class="fields" style="float:left;width:50%;padding-right:30px;">
<div class="field">
<div class="label">
<label for="pullrequest_title">${_('Title')}:</label>
</div>
<div class="input">
${h.text('pullrequest_title',class_="large",placeholder=_('Summarize the changes - or leave empty'))}
</div>
</div>
<div class="field">
<div class="label label-textarea">
<label for="pullrequest_desc">${_('Description')}:</label>
</div>
<div class="textarea text-area editor">
${h.textarea('pullrequest_desc',size=30,placeholder=_('Write a short description on this pull request'))}
</div>
</div>
<div class="field">
<div class="label label-textarea">
<label for="pullrequest_desc">${_('Changeset flow')}:</label>
</div>
<div class="input">
##ORG
<div>
<div>
<div style="padding:5px 3px 3px 3px;">
<b>${_('Origin repository')}:</b> <span id="org_repo_desc">${c.db_repo.description.split('\n')[0]}</span>
</div>
<div>
${h.select('org_repo','',c.cs_repos,class_='refs')}:${h.select('org_ref',c.default_cs_ref,c.cs_refs,class_='refs')}
</div>
<div style="padding:5px 3px 3px 3px;">
<b>${_('Revision')}:</b> <span id="org_rev_span">-</span>
</div>
</div>
</div>
##OTHER, most Probably the PARENT OF THIS FORK
<div style="border-top: 1px solid #EEE; margin: 5px 0px 0px 0px">
<div>
## filled with JS
<div style="padding:5px 3px 3px 3px;">
<b>${_('Destination repository')}:</b> <span id="other_repo_desc">${c.a_repo.description.split('\n')[0]}</span>
</div>
<div>
${h.select('other_repo',c.a_repo.repo_name,c.a_repos,class_='refs')}:${h.select('other_ref',c.default_a_ref,c.a_refs,class_='refs')}
</div>
<div style="padding:5px 3px 3px 3px;">
<b>${_('Revision')}:</b> <span id="other_rev_span">-</span>
</div>
</div>
</div>
<div style="clear:both"></div>
</div>
</div>
<div class="field">
<div class="buttons">
${h.submit('save',_('Create Pull Request'),class_="btn")}
${h.reset('reset',_('Reset'),class_="btn")}
</div>
</div>
</div>
## Reviewers
<div style="float:left; border-left:1px dashed #eee">
<div class="pr-details-title">${_('Pull Request Reviewers')}</div>
<div id="reviewers" style="padding:0px 0px 0px 15px">
## members goes here !
<div>
<ul id="review_members" class="group_members">
%for member in [c.a_repo.user]:
<li id="reviewer_${member.user_id}">
<div class="reviewers_member">
<div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(member.email, 14)}"/> </div>
<div style="float:left">${member.firstname} ${member.lastname} (${_('owner')})</div>
<input type="hidden" value="${member.user_id}" name="review_members" />
<span class="action_button" style="padding: 3px" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">
<i class="icon-remove-sign" style="color: #FF4444;"></i>
</span>
</div>
</li>
%endfor
</ul>
</div>
<div class='ac'>
<div class="reviewer_ac">
${h.text('user', class_='yui-ac-input',placeholder=_('Type name of reviewer to add'))}
<div id="reviewers_container"></div>
</div>
</div>
</div>
</div>
<div style="clear:both;padding: 0 0 30px 0;"></div>
<h4>${_('Changesets')}</h4>
<div style="float:left;padding:0px 30px 30px 30px">
## overview pulled by ajax
<div style="float:left" id="pull_request_overview"></div>
</div>
<div style="clear:both;"></div>
</div>
${h.end_form()}
</div>
<script type="text/javascript" src="${h.url('/js/graph.js')}"></script>
<script type="text/javascript">
var _USERS_AC_DATA = ${c.users_array|n};
var _GROUPS_AC_DATA = ${c.user_groups_array|n};
PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);
pyroutes.register('pullrequest_repo_info', "${url('pullrequest_repo_info',repo_name='%(repo_name)s')}", ['repo_name']);
var pendingajax = undefined;
var otherrepoChanged = function(){
var repo_name = $('#other_repo').val();
if (pendingajax) {
pendingajax.abort();
pendingajax = undefined;
}
pendingajax = ajaxGET(pyroutes.url('pullrequest_repo_info', {"repo_name": repo_name}),
function(o){
pendingajax = undefined;
var data = JSON.parse(o.responseText);
$('#other_repo_desc').html(data.description);
// replace options of other_ref with the ones for the current other_repo
var $other_ref = $('#other_ref');
$other_ref.empty();
for(var i = 0; i < data.refs.length; i++)
{
var $optgroup = $('<optgroup/>').attr('label', data.refs[i][1]);
var options = data.refs[i][0];
var length = options.length;
for(var j = 0; j < length; j++)
{
$optgroup.append($('<option/>').text(options[j][1]).val(options[j][0]));
}
$other_ref.append($optgroup);
}
$other_ref.val(data.selected_ref);
// reset && add the reviewer based on selected repo
YUD.get('review_members').innerHTML = '';
addReviewMember(data.user.user_id, data.user.firstname,
data.user.lastname, data.user.username,
data.user.gravatar_link);
// re-populate the select2 thingie
$("#other_ref").select2({
dropdownAutoWidth: true
});
loadPreview();
});
};
var loadPreview = function(){
//url template
var url = "${h.url('compare_url',
repo_name='__other_repo__',
org_ref_type='rev',
org_ref_name='__other_ref_name__',
other_repo='__org_repo__',
other_ref_type='rev',
other_ref_name='__org_ref_name__',
as_form=True,
merge=True,
)}";
var org_repo = YUQ('#pull_request_form #org_repo')[0].value;
var org_ref = YUQ('#pull_request_form #org_ref')[0].value.split(':');
## TODO: make nice link like link_to_ref() do
YUD.get('org_rev_span').innerHTML = org_ref[2].substr(0,12);
var other_repo = YUQ('#pull_request_form #other_repo')[0].value;
var other_ref = YUQ('#pull_request_form #other_ref')[0].value.split(':');
YUD.get('other_rev_span').innerHTML = other_ref[2].substr(0,12);
var select_refs = YUQ('#pull_request_form select.refs')
var rev_data = {
'__org_repo__': org_repo,
'__org_ref_name__': org_ref[2],
'__other_repo__': other_repo,
'__other_ref_name__': other_ref[2]
}; // gather the org/other ref and repo here
for (k in rev_data){
url = url.replace(k,rev_data[k]);
}
if (pendingajax) {
pendingajax.abort();
pendingajax = undefined;
}
pendingajax = asynchtml(url, $('#pull_request_overview'), function(o){
pendingajax = undefined;
var jsdata = eval('('+YUD.get('jsdata').innerHTML+')'); // TODO: just get json
var r = new BranchRenderer('graph_canvas', 'graph_content_pr');
r.render(jsdata,100);
});
}
$(document).ready(function(){
$("#org_repo").select2({
dropdownAutoWidth: true
});
## (org_repo can't change)
$("#org_ref").select2({
dropdownAutoWidth: true
});
$("#org_ref").on("change", function(e){
loadPreview();
});
$("#other_repo").select2({
dropdownAutoWidth: true
});
$("#other_repo").on("change", function(e){
otherrepoChanged();
});
$("#other_ref").select2({
dropdownAutoWidth: true
});
$("#other_ref").on("change", function(e){
loadPreview();
});
//lazy load overview after 0.5s
setTimeout(loadPreview, 500);
});
</script>
</%def>
|