##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

File last commit:

r1892:89ddfad2 default
r2784:e8c62649 default
Show More
my_account_pullrequests.mako
90 lines | 3.4 KiB | application/x-mako | MakoHtmlLexer
/ rhodecode / templates / admin / my_account / my_account_pullrequests.mako
templating: use .mako as extensions for template files.
r1282 <%namespace name="base" file="/base/base.mako"/>
<div class="panel panel-default">
<div class="panel-body">
dan
my-account: migrated left over controller functions into pyramid views....
r1892 %if c.closed:
templating: use .mako as extensions for template files.
r1282 ${h.checkbox('show_closed',checked="checked", label=_('Show Closed Pull Requests'))}
%else:
${h.checkbox('show_closed',label=_('Show Closed Pull Requests'))}
%endif
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
dan
my-account: migrated left over controller functions into pyramid views....
r1892 <h3 class="panel-title">${_('Pull Requests You Participate In')}</h3>
templating: use .mako as extensions for template files.
r1282 </div>
dan
my-account: migrated left over controller functions into pyramid views....
r1892 <div class="panel-body panel-body-min-height">
<table id="pull_request_list_table" class="display"></table>
templating: use .mako as extensions for template files.
r1282 </div>
</div>
dan
my-account: migrated left over controller functions into pyramid views....
r1892 <script type="text/javascript">
$(document).ready(function() {
templating: use .mako as extensions for template files.
r1282 $('#show_closed').on('click', function(e){
if($(this).is(":checked")){
dan
my-account: migrated left over controller functions into pyramid views....
r1892 window.location = "${h.route_path('my_account_pullrequests', _query={'pr_show_closed':1})}";
templating: use .mako as extensions for template files.
r1282 }
else{
dan
my-account: migrated left over controller functions into pyramid views....
r1892 window.location = "${h.route_path('my_account_pullrequests')}";
templating: use .mako as extensions for template files.
r1282 }
});
dan
my-account: migrated left over controller functions into pyramid views....
r1892
var $pullRequestListTable = $('#pull_request_list_table');
templating: use .mako as extensions for template files.
r1282
dan
my-account: migrated left over controller functions into pyramid views....
r1892 // participating object list
$pullRequestListTable.DataTable({
processing: true,
serverSide: true,
ajax: {
"url": "${h.route_path('my_account_pullrequests_data')}",
"data": function (d) {
d.closed = "${c.closed}";
}
},
dom: 'rtp',
pageLength: ${c.visual.dashboard_items},
order: [[ 2, "desc" ]],
columns: [
templating: use .mako as extensions for template files.
r1282 { data: {"_": "status",
"sort": "status"}, title: "", className: "td-status", orderable: false},
{ data: {"_": "target_repo",
"sort": "target_repo"}, title: "${_('Target Repo')}", className: "td-targetrepo", orderable: false},
{ data: {"_": "name",
"sort": "name_raw"}, title: "${_('Name')}", className: "td-componentname", "type": "num" },
{ data: {"_": "author",
"sort": "author_raw"}, title: "${_('Author')}", className: "td-user", orderable: false },
{ data: {"_": "title",
"sort": "title"}, title: "${_('Title')}", className: "td-description" },
{ data: {"_": "comments",
"sort": "comments_raw"}, title: "", className: "td-comments", orderable: false},
{ data: {"_": "updated_on",
"sort": "updated_on_raw"}, title: "${_('Last Update')}", className: "td-time" }
dan
my-account: migrated left over controller functions into pyramid views....
r1892 ],
templating: use .mako as extensions for template files.
r1282 language: {
paginate: DEFAULT_GRID_PAGINATION,
dan
my-account: migrated left over controller functions into pyramid views....
r1892 sProcessing: _gettext('loading...'),
templating: use .mako as extensions for template files.
r1282 emptyTable: _gettext("There are currently no open pull requests requiring your participation.")
},
"drawCallback": function( settings, json ) {
timeagoActivate();
},
"createdRow": function ( row, data, index ) {
if (data['closed']) {
$(row).addClass('closed');
}
if (data['owned']) {
$(row).addClass('owned');
}
}
});
dan
my-account: migrated left over controller functions into pyramid views....
r1892 $pullRequestListTable.on('xhr.dt', function(e, settings, json, xhr){
$pullRequestListTable.css('opacity', 1);
});
$pullRequestListTable.on('preXhr.dt', function(e, settings, data){
$pullRequestListTable.css('opacity', 0.3);
});
templating: use .mako as extensions for template files.
r1282 });
</script>