Files
@ 9855b31d033b
Branch filter:
Location: kallithea/rhodecode/templates/admin/notifications/notifications.html - annotation
9855b31d033b
2.1 KiB
text/html
pullrequests: fix changesets ordering being reversed when creating new pull requests
41b4edf77b5b tried to make the displayed order of changeset consistent: The
topmost is always the latest.
That did however also reverse the ordering of the changesets sent back in the
post when used in the pull request creation form. Displaying the pull request
later on would reverse it again and thus show it in the 'wrong' order.
We now undo that reversing when creating the pull requests, and the stored data
will thus be the same as before.
41b4edf77b5b tried to make the displayed order of changeset consistent: The
topmost is always the latest.
That did however also reverse the ordering of the changesets sent back in the
post when used in the pull request creation form. Displaying the pull request
later on would reverse it again and thus show it in the 'wrong' order.
We now undo that reversing when creating the pull requests, and the stored data
will thus be the same as before.
cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 1f334a68d057 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 b4f401524060 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 cac5109ac3b6 f91d3f9b7230 93d4e3eb7d84 93d4e3eb7d84 93d4e3eb7d84 93d4e3eb7d84 93d4e3eb7d84 cac5109ac3b6 d5e42c00f3c1 77e376fdc4c6 74f2910f7ad9 f8742e1acf08 74f2910f7ad9 77e376fdc4c6 d04243e932cc 64f7cf8f6a33 2aee0dc1784e 523b1011a625 d04243e932cc 2aee0dc1784e 2aee0dc1784e 2aee0dc1784e cac5109ac3b6 cac5109ac3b6 3fdf7c3be2c9 3fdf7c3be2c9 3fdf7c3be2c9 3fdf7c3be2c9 3fdf7c3be2c9 3fdf7c3be2c9 3fdf7c3be2c9 3fdf7c3be2c9 3fdf7c3be2c9 3fdf7c3be2c9 3fdf7c3be2c9 3fdf7c3be2c9 64f7cf8f6a33 d04243e932cc 3fdf7c3be2c9 64f7cf8f6a33 f8742e1acf08 f8742e1acf08 f8742e1acf08 b4f401524060 f8742e1acf08 cac5109ac3b6 f91d3f9b7230 | ## -*- coding: utf-8 -*-
<%inherit file="/base/base.html"/>
<%def name="title()">
${_('My Notifications')} ${c.rhodecode_user.username} · ${c.rhodecode_name}
</%def>
<%def name="breadcrumbs_links()">
${_('My Notifications')}
</%def>
<%def name="page_nav()">
${self.menu('admin')}
</%def>
<%def name="main()">
<div class="box">
<!-- box / title -->
<div class="title">
${self.breadcrumbs()}
##<ul class="links">
## <li>
## <span style="text-transform: uppercase;"><a href="#">${_('Compose message')}</a></span>
## </li>
##</ul>
</div>
<div style="padding:14px 18px;text-align: right;float:left">
<span id='all' class="ui-btn"><a href="${h.url.current()}">${_('All')}</a></span>
<span id='comment' class="ui-btn"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>
<span id='pull_request' class="ui-btn"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull requests')}</a></span>
</div>
%if c.notifications:
<div style="padding:14px 18px;text-align: right;float:right">
<span id='mark_all_read' class="ui-btn">${_('Mark all read')}</span>
</div>
%endif
<div id='notification_data'>
<%include file='notifications_data.html'/>
</div>
</div>
<script type="text/javascript">
var url_action = "${url('notification', notification_id='__NOTIFICATION_ID__')}";
var run = function(){
YUE.on(YUQ('.delete-notification'),'click',function(e){
var notification_id = e.currentTarget.id;
deleteNotification(url_action,notification_id)
})
YUE.on(YUQ('.read-notification'),'click',function(e){
var notification_id = e.currentTarget.id;
readNotification(url_action,notification_id)
})
}
run()
YUE.on('mark_all_read','click',function(e){
var url = "${h.url('notifications_mark_all_read', **request.GET.mixed())}";
ypjax(url,'notification_data',function(){run()});
})
var current_filter = "${c.current_filter}";
if (YUD.get(current_filter)){
YUD.addClass(current_filter, 'active');
}
</script>
</%def>
|