pr: adding last updated column to user pull request list, fixes #4162

rhodecode/templates/admin/my_account/my_account_pullrequests.html

@@ -1,157 +1,155 b''
 <%namespace name="base" file="/base/base.html"/>
 
 <div class="panel panel-default">
   <div class="panel-body">
       %if c.show_closed:
         ${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">
     <h3 class="panel-title">${_('Pull Requests You Opened')}</h3>
   </div>
   <div class="panel-body">
     <div class="pullrequestlist">
         %if c.my_pull_requests:
         <table class="rctable">
           <thead>
             <th class="td-status"></th>
             <th>${_('Target Repo')}</th>
             <th>${_('Author')}</th>
             <th></th>
             <th>${_('Title')}</th>
-            <th class="td-time">${_('Opened On')}</th>
+            <th class="td-time">${_('Last Update')}</th>
             <th></th>
           </thead>
           %for pull_request in c.my_pull_requests:
             <tr class="${'closed' if pull_request.is_closed() else ''} prwrapper">
               <td class="td-status">
                 <div class="${'flag_status %s' % pull_request.calculated_review_status()} pull-left"></div>
               </td>
               <td class="truncate-wrap td-componentname">
                 <div class="truncate">
                   ${h.link_to(pull_request.target_repo.repo_name,h.url('summary_home',repo_name=pull_request.target_repo.repo_name))}
                 </div>
               </td>
               <td class="user">
                 ${base.gravatar_with_user(pull_request.author.email, 16)}
               </td>
               <td class="td-message expand_commit" data-pr-id="m${pull_request.pull_request_id}" title="${_('Expand commit message')}">
                 <div class="show_more_col">
                   <i class="show_more"></i>&nbsp;
                 </div>
               </td>
               <td class="mid td-description">
                 <div class="log-container truncate-wrap">
                     <div class="message truncate" id="c-m${pull_request.pull_request_id}"><a href="${h.url('pullrequest_show',repo_name=pull_request.target_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">#${pull_request.pull_request_id}: ${pull_request.title}</a>\
                     %if pull_request.is_closed():
                       &nbsp;(${_('Closed')})\
                     %endif
                     <br/>${pull_request.description}</div>
                 </div>
               </td>
-
               <td class="td-time">
-                ${h.age_component(pull_request.created_on)}
+                ${h.age_component(pull_request.updated_on)}
               </td>
               <td class="td-action repolist_actions">
                 ${h.secure_form(url('pullrequest_delete', repo_name=pull_request.target_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')}
                   ${h.submit('remove_%s' % pull_request.pull_request_id, _('Delete'),
                   class_="btn btn-link btn-danger",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
                 ${h.end_form()}
               </td>
             </tr>
           %endfor
         </table>
        %else:
         <h2><span class="empty_data">${_('You currently have no open pull requests.')}</span></h2>
        %endif
     </div>
   </div>
 </div>
 
 <div class="panel panel-default">
   <div class="panel-heading">
     <h3 class="panel-title">${_('Pull Requests You Participate In')}</h3>
   </div>
 
   <div class="panel-body">
     <div class="pullrequestlist">
         %if c.participate_in_pull_requests:
         <table class="rctable">
           <thead>
             <th class="td-status"></th>
             <th>${_('Target Repo')}</th>
             <th>${_('Author')}</th>
             <th></th>
             <th>${_('Title')}</th>
-            <th class="td-time">${_('Opened On')}</th>
+            <th class="td-time">${_('Last Update')}</th>
           </thead>
           %for pull_request in c.participate_in_pull_requests:
             <tr class="${'closed' if pull_request.is_closed() else ''} prwrapper">
               <td class="td-status">
                 <div class="${'flag_status %s' % pull_request.calculated_review_status()} pull-left"></div>
               </td>
               <td class="truncate-wrap td-componentname">
                 <div class="truncate">
                   ${h.link_to(pull_request.target_repo.repo_name,h.url('summary_home',repo_name=pull_request.target_repo.repo_name))}
                 </div>
               </td>
               <td class="user">
                 ${base.gravatar_with_user(pull_request.author.email, 16)}
               </td>
               <td class="td-message expand_commit" data-pr-id="p${pull_request.pull_request_id}" title="${_('Expand commit message')}">
                 <div class="show_more_col">
                   <i class="show_more"></i>&nbsp;
                 </div>
               </td>
               <td class="mid td-description">
                 <div class="log-container truncate-wrap">
                     <div class="message truncate" id="c-p${pull_request.pull_request_id}"><a href="${h.url('pullrequest_show',repo_name=pull_request.target_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">#${pull_request.pull_request_id}: ${pull_request.title}</a>\
                     %if pull_request.is_closed():
                       &nbsp;(${_('Closed')})\
                     %endif
                     <br/>${pull_request.description}</div>
                 </div>
               </td>
-
               <td class="td-time">
-                ${h.age_component(pull_request.created_on)}
+                ${h.age_component(pull_request.updated_on)}
               </td>
             </tr>
           %endfor
         </table>
         %else:
          <h2 class="empty_data">${_('There are currently no open pull requests requiring your participation.')}</h2>
         %endif
     </div>
   </div>
 </div>
 
 <script>
     $('#show_closed').on('click', function(e){
         if($(this).is(":checked")){
             window.location = "${h.url('my_account_pullrequests', pr_show_closed=1)}";
         }
         else{
             window.location = "${h.url('my_account_pullrequests')}";
         }
     });
     $('.expand_commit').on('click',function(e){
       var target_expand = $(this);
       var cid = target_expand.data('prId');
 
       if (target_expand.hasClass('open')){
         $('#c-'+cid).css({'height': '2.75em', 'text-overflow': 'ellipsis', 'overflow':'hidden'});
         target_expand.removeClass('open');
       }
       else {
         $('#c-'+cid).css({'height': 'auto', 'text-overflow': 'initial', 'overflow':'visible'});
         target_expand.addClass('open');
       }
     });
 </script>

rhodecode/templates/pullrequests/pullrequests.html

@@ -1,132 +1,132 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('%s Pull Requests') % c.repo_name}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
 
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='showpullrequest')}
 </%def>
 
 
 <%def name="main()">
 <div class="box">
   <div class="title">
       ${self.repo_page_title(c.rhodecode_db_repo)}
 
       <ul class="links">
         <li>
            %if c.rhodecode_user.username != h.DEFAULT_USER:
             <span>
                 <a id="open_new_pull_request" class="btn btn-small btn-success" href="${h.url('pullrequest_home',repo_name=c.repo_name)}">
                     ${_('Open new Pull Request')}
                 </a>
             </span>
            %endif
         </li>
       </ul>
 
     ${self.breadcrumbs()}
   </div>
 
   <div class="sidebar-col-wrapper">
     ##main
     <div class="sidebar">
         <ul class="nav nav-pills nav-stacked">
           <li class="${'active' if c.active=='open' else ''}"><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name,source=0)}">${_('Opened')}</a></li>
           <li class="${'active' if c.active=='my' else ''}"><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name,source=0,my=1)}">${_('Opened by me')}</a></li>
           <li class="${'active' if c.active=='awaiting' else ''}"><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name,source=0,awaiting_review=1)}">${_('Awaiting review')}</a></li>
           <li class="${'active' if c.active=='awaiting_my' else ''}"><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name,source=0,awaiting_my_review=1)}">${_('Awaiting my review')}</a></li>
           <li class="${'active' if c.active=='closed' else ''}"><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name,source=0,closed=1)}">${_('Closed')}</a></li>
           <li class="${'active' if c.active=='source' else ''}"><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name,source=1)}">${_('From this repo')}</a></li>
         </ul>
     </div>
 
     <div class="main-content-full-width">
       <div class="panel panel-default">
         <div class="panel-heading">
           <h3 class="panel-title">
               %if c.source:
                   ${_('Pull Requests from %(repo_name)s repository') % {'repo_name': c.repo_name}}
               %elif c.closed:
                   ${_('Closed Pull Requests to repository %(repo_name)s') % {'repo_name': c.repo_name}}
               %elif c.my:
                   ${_('Pull Requests to %(repo_name)s repository opened by me') % {'repo_name': c.repo_name}}
               %elif c.awaiting_review:
                   ${_('Pull Requests to %(repo_name)s repository awaiting review') % {'repo_name': c.repo_name}}
               %elif c.awaiting_my_review:
                   ${_('Pull Requests to %(repo_name)s repository awaiting my review') % {'repo_name': c.repo_name}}
               %else:
                   ${_('Pull Requests to %(repo_name)s repository') % {'repo_name': c.repo_name}}
               %endif
           </h3>
         </div>
         <div class="panel-body">
           <table id="pull_request_list_table" class="display"></table>
         </div>
       </div>
     </div>
   </div>
 </div>
 
 <script type="text/javascript">
 $(document).ready(function() {
     // object list
     $('#pull_request_list_table').DataTable({
       data: ${c.data|n},
       processing: true,
       serverSide: true,
       deferLoading: ${c.records_total},
       ajax: "",
       dom: 'tp',
       pageLength: ${c.visual.dashboard_items},
       order: [[ 1, "desc" ]],
       columns: [
          { data: {"_": "status",
                   "sort": "status"}, title: "", className: "td-status", 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: "${_('Updated on')}", className: "td-time" }
+                  "sort": "updated_on_raw"}, title: "${_('Last Update')}", className: "td-time" }
       ],
       language: {
             paginate: DEFAULT_GRID_PAGINATION,
             emptyTable: _gettext("No pull requests available yet.")
       },
       "drawCallback": function( settings, json ) {
           timeagoActivate();
       },
       "createdRow": function ( row, data, index ) {
           if (data['closed']) {
             $(row).addClass('closed');
           }
       }
     });
 });
 $('#pull_request_list_table').on('xhr.dt', function(e, settings, json, xhr){
     $('#pull_request_list_table').css('opacity', 1);
 });
 
 $('#pull_request_list_table').on('preXhr.dt', function(e, settings, data){
     $('#pull_request_list_table').css('opacity', 0.3);
 });
 </script>
 </%def>