kallithea Changeset - 33a58b74bbc3

Changeset - 33a58b74bbc3

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 12 years ago 2013-06-28 11:50:13
madski@unity3d.com

pull requests: include 'detailed view' and ancestor information in ajax chunk, open diff in another window

2 files changed with 18 insertions and 10 deletions:

kallithea/templates/compare/compare_cs.html

kallithea/templates/pullrequests/pullrequest.html

0 comments (0 inline, 0 general)

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -31,30 +31,44 @@ @@
         <td>
         %if cs.branch:
         <span class="branchtag">${cs.branch}</span>
         %endif
         </td>
         <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
             <i class="icon-resize-vertical" style="color:#DDD"></i>
         </td>
         <td><div id="C-${cs.raw_id}" class="message" style="white-space:normal; height:1.1em; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div></td>
         </tr>
     %endfor
     </table>
     %if c.ancestor:
       <div class="ancestor">${_('Ancestor')}:
     %if c.as_form:
       <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
       ## links should perhaps use ('rev', c.org_rev) instead ...
       ${h.link_to(_('Show merge diff'),
         h.url('compare_url',
           repo_name=c.org_repo.repo_name,
           org_ref_type=c.org_ref_type, org_ref_name=c.org_ref_name,
           other_repo=c.other_repo.repo_name,
           other_ref_type=c.other_ref_type, other_ref_name=c.other_ref_name,
           merge='1'),
         )}
       </div>
       <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
         ${_('Common ancestor')}:
         %if c.ancestor:
         ${h.link_to(h.short_id(c.ancestor),h.url('changeset_home',repo_name=c.repo_name,revision=c.ancestor))}
         %else:
         ${_('No common ancestor found - repositories are unrelated')}
         %endif
       </div>
     %endif
     %if c.as_form:
       ${h.hidden('ancestor_rev',c.ancestor)}
       ${h.hidden('merge_rev',c.cs_ranges[-1].raw_id)}
     %endif
     %if c.cs_ranges_org is not None:
       ## TODO: list actual changesets?
       <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
         ${h.link_to_ref(c.other_repo.repo_name, c.other_ref_type, c.other_ref_name, c.other_rev)}
         ${_('is')}
         <a href="${c.swap_url}">${_('%s changesets') % (len(c.cs_ranges_org))}</a>
         ${_('behind')}
         ${h.link_to_ref(c.org_repo.repo_name, c.org_ref_type, c.org_ref_name, c.org_rev)}
       </div>

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -115,27 +115,24 @@ ${self.repo_context_bar('showpullrequest @@
                    <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 style="float:left;clear:both;padding:10px 10px 10px 0px;display:none">
                 <a id="pull_request_overview_url" href="#">${_('Detailed compare view')}</a>
            </div>
         </div>
         <div style="clear:both;"></div>
     </div>
     ${h.end_form()}
 </div>
 <script type="text/javascript">
   var _USERS_AC_DATA = ${c.users_array|n};
   var _GROUPS_AC_DATA = ${c.user_groups_array|n};
@@ @@ -190,27 +187,24 @@ ${self.repo_context_bar('showpullrequest @@
           '__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]);
+      }
       YUD.get('pull_request_overview').innerHTML = "${_('Loading ...')}";
       ypjax(url,'pull_request_overview');
       YUD.get('pull_request_overview_url').href = url; // shouldn't have as_form ... but ...
       YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','');
+  }
   ## refresh automatically when something changes (org_repo can't change)
   YUE.on('org_ref', 'change', function(e){
      loadPreview();
   });
   YUE.on('other_repo', 'change', function(e){
       otherrepoChanged();
       loadPreview();
   });

0 comments (0 inline, 0 general)