##// END OF EJS Templates
auth: the correct prefixes for python bcrypt are $2a or $2b....
auth: the correct prefixes for python bcrypt are $2a or $2b. handle the 2b too for consistency.

File last commit:

r1605:a40f72fa default
r1626:a402cae5 default
Show More
repo_edit_strip.mako
168 lines | 6.0 KiB | application/x-mako | MakoHtmlLexer
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 <div class="panel panel-default">
<div class="panel-heading">
strip: ui changes....
r1589 <h3 class="panel-title">${_('Strip commits from repository')}</h3>
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 </div>
<div class="panel-body">
%if c.repo_info.repo_type != 'svn':
strip: ui changes....
r1589 <h4>${_('Please provide up to %d commits commits to strip') % c.strip_limit}</h4>
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 <p>
${_('In the first step commits will be verified for existance in the repository')}. </br>
${_('In the second step, correct commits will be available for stripping')}.
</p>
${h.secure_form(h.route_path('strip_check', repo_name=c.repo_info.repo_name), method='post')}
<div id="change_body" class="field">
<div id="box-1" class="inputx locked_input">
strip: ui changes....
r1589 <input class="text" id="changeset_id-1" name="changeset_id-1" size="59"
placeholder="${_('Enter full 40 character commit sha')}" type="text" value="">
<div id="plus_icon-1" class="btn btn-default plus_input_button" onclick="addNew(1);return false">
<i class="icon-plus">${_('Add another commit')}</i>
</div>
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 </div>
</div>
strip: ui changes....
r1589
<div id="results" style="display:none; padding: 10px 0px;"></div>
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 <div class="buttons">
strip: ui changes....
r1589 <button class="btn btn-small btn-primary" onclick="checkCommits();return false">
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 ${_('Check commits')}
</button>
</div>
${h.end_form()}
%else:
strip: ui changes....
r1589 <h4>${_('Sorry this functionality is not available for SVN repository')}</h4>
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 %endif
</div>
</div>
<script>
var plus_leaf = 1;
addNew = function(number){
if (number >= ${c.strip_limit}){
return;
}
Bartłomiej Wołyńczyk
strip: cleaning code, plus fixing changes after switch from <i/> to <div/>
r1605 var minus = '<i class="icon-minus">${_('Remove')}</i>';
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 $('#plus_icon-'+number).detach();
number++;
strip: ui changes....
r1589
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 var input = '<div id="box-'+number+'" class="inputx locked_input">'+
Bartłomiej Wołyńczyk
strip: cleaning code, plus fixing changes after switch from <i/> to <div/>
r1605 '<input class="text" id="changeset_id-'+number+'" name="changeset_id-'+number+'" size="59" type="text" value=""' +
'placeholder="${_('Enter full 40 character commit sha')}">'+
strip: ui changes....
r1589 '<div id="plus_icon-'+number+'" class="btn btn-default plus_input_button" onclick="addNew('+number+');return false">'+
Bartłomiej Wołyńczyk
strip: cleaning code, plus fixing changes after switch from <i/> to <div/>
r1605 '<i class="icon-plus">${_('Add another commit')}</i>'+
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 '</div>'+
strip: ui changes....
r1589 '<div id="minus_icon-'+number+'" class="btn btn-default minus_input_button" onclick="delOld('+(number)+');return false">'+
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 minus +
'</div>' +
'</div>';
$('#change_body').append(input);
plus_leaf++;
strip: cleanup JS code.
r1588 };
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587
strip: cleanup JS code.
r1588 reIndex = function(number){
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 for(var i=number;i<=plus_leaf;i++){
var check = $('#box-'+i);
if (check.length == 0){
var change = $('#box-'+(i+1));
change.attr('id','box-'+i);
var plus = $('#plus_icon-'+(i+1));
Bartłomiej Wołyńczyk
strip: cleaning code, plus fixing changes after switch from <i/> to <div/>
r1605
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 if (plus.length != 0){
plus.attr('id','plus_icon-'+i);
Bartłomiej Wołyńczyk
strip: cleaning code, plus fixing changes after switch from <i/> to <div/>
r1605 plus.attr('onclick','addNew('+i+');return false');
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 plus_leaf--;
}
var minus = $('#minus_icon-'+(i+1));
Bartłomiej Wołyńczyk
strip: cleaning code, plus fixing changes after switch from <i/> to <div/>
r1605
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 minus.attr('id','minus_icon-'+i);
Bartłomiej Wołyńczyk
strip: cleaning code, plus fixing changes after switch from <i/> to <div/>
r1605
minus.attr('onclick','delOld('+i+');re' +
'turn false');
var input = $('input#changeset_id-'+(i+1));
input.attr('name','changeset_id-'+i);
input.attr('id','changeset_id-'+i);
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 }
}
strip: cleanup JS code.
r1588 };
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587
delOld = function(number){
$('#box-'+number).remove();
number = number - 1;
var box = $('#box-'+number);
strip: ui changes....
r1589 var plus = '<div id="plus_icon-'+number+'" class="btn btn-default plus_input_button" onclick="addNew('+number +');return false">'+
'<i id="i_plus_icon-'+number+'" class="icon-plus">${_('Add another commit')}</i></div>';
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 var minus = $('#minus_icon-'+number);
if(number +1 == plus_leaf){
minus.detach();
box.append(plus);
box.append(minus);
Bartłomiej Wołyńczyk
strip: fix js bug
r1604 plus_leaf --;
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 }
strip: cleanup JS code.
r1588 reIndex(number+1);
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587
strip: cleanup JS code.
r1588 };
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587
var result_data;
strip: cleanup JS code.
r1588 checkCommits = function() {
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 var postData = $('form').serialize();
$('#results').show();
$('#results').html('<h4>${_('Checking commits')}...</h4>');
var url = "${h.route_path('strip_check', repo_name=c.repo_info.repo_name)}";
var btn = $('button');
btn.attr('disabled', 'disabled');
btn.addClass('disabled');
var success = function (data) {
result_data = {};
var i = 0;
result ='';
$.each(data, function(index, value){
i= index;
var box = $('#box-'+index);
if (value.rev){
result_data[index] = JSON.stringify(value);
msg = '${_("author")}: ' + value.author + ' ${_("comment")}: ' + value.comment;
strip: ui changes....
r1589 result += '<h4><code>' +value.rev+ '</code>${_(' commit verified positive')}</br> '+ msg + '</h4>';
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 }
else{
strip: ui changes....
r1589 result += '<h4><code>' +value.commit+ '</code>${_(' commit verified negative')}' + '</h4>';
Bartłomiej Wołyńczyk
strip: added functionality to stip choosen commits on repo settings
r1587 }
box.remove();
});
var box = $('#box-'+(parseInt(i)+1));
box.remove();
$('#results').html(result);
};
btn.html('Strip');
btn.removeAttr('disabled');
btn.removeClass('disabled');
btn.attr('onclick','strip();return false;');
ajaxPOST(url, postData, success, null);
};
strip = function(){
var url = "${h.route_path('strip_execute', repo_name=c.repo_info.repo_name)}";
var success = function(data){
result = '';
$.each(data, function(index, value){
if(data[index]){
result += '<h4>' +index+ '${_(' commit striped successful')}' + '</h4>';
}
else{
result += '<h4>' +index+ '${_(' commit striped failed')}' + '</h4>';
}
});
$('#results').html(result);
};
ajaxPOST(url, result_data, success, null);
var btn = $('button');
btn.attr('disabled', 'disabled');
btn.addClass('disabled');
};
</script>