Mercurial > kallithea

changeset 6962:5f9de2b23725

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
js: make links to child changesets use a right arrow again Previous changes where pulled incorrectly - fix that.
author domruf <dominikruf@gmail.com>
date Mon, 23 Oct 2017 22:52:50 +0200
parents ebb6f89b8d22
children 77a88040a262
files kallithea/public/js/base.js kallithea/templates/base/base.html
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/js/base.js	Sun Oct 01 21:39:13 2017 +0200
+++ b/kallithea/public/js/base.js	Mon Oct 23 22:52:50 2017 +0200
@@ -1518,13 +1518,17 @@
                     else if(data.results.length === 2){
                         $this.addClass('disabled');
                         $this.addClass('double');
+                        var template =
+                            ($this.data('linktype') == 'parent' ? '<i class="icon-left-open"/> ' : '') +
+                            '<a title="__title__" href="__url__">__rev__</a>' +
+                            ($this.data('linktype') == 'child' ? ' <i class="icon-right-open"/>' : '');
                         var _html = '';
-                        _html +='<i class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
+                        _html += template
                                 .replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6)))
                                 .replace('__title__', data.results[0].message)
                                 .replace('__url__', pyroutes.url('changeset_home', {'repo_name': repo_name, 'revision': data.results[0].raw_id}));
                         _html +='<br/>'
-                        _html +='<i class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
+                        _html += template
                                 .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))
                                 .replace('__title__', data.results[1].message)
                                 .replace('__url__', pyroutes.url('changeset_home', {'repo_name': repo_name, 'revision': data.results[1].raw_id}));
--- a/kallithea/templates/base/base.html	Sun Oct 01 21:39:13 2017 +0200
+++ b/kallithea/templates/base/base.html	Mon Oct 23 22:52:50 2017 +0200
@@ -533,6 +533,7 @@
     <div class="pull-left">
         <div class="parent-child-link"
              data-ajax-url="${h.url('changeset_parents',repo_name=c.repo_name, revision=c.changeset.raw_id)}"
+             data-linktype="parent"
              data-reponame="${c.repo_name}">
             <i class="icon-left-open"></i> <a href="#">${_('Parent rev.')}</a>
         </div>
@@ -541,6 +542,7 @@
     <div class="pull-right">
         <div class="parent-child-link"
              data-ajax-url="${h.url('changeset_children',repo_name=c.repo_name, revision=c.changeset.raw_id)}"
+             data-linktype="child"
              data-reponame="${c.repo_name}">
             <a href="#">${_('Child rev.')}</a> <i class="icon-right-open"></i>
         </div>