kallithea Changeset - 5f9de2b23725

Changeset - 5f9de2b23725

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

domruf - 8 years ago 2017-10-23 22:52:50
dominikruf@gmail.com

js: make links to child changesets use a right arrow again

Previous changes where pulled incorrectly - fix that.

2 files changed with 8 insertions and 2 deletions:

kallithea/public/js/base.js

kallithea/templates/base/base.html

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1509,30 +1509,34 @@ var activate_parent_child_links = functi @@
                     var repo_name = $this.data('reponame');
                     if(data.results.length === 0){
                         $this.addClass('disabled');
                         $this.text(_TM['No revisions']);
+                    }
                     if(data.results.length === 1){
                         var commit = data.results[0];
                         window.location = pyroutes.url('changeset_home', {'repo_name': repo_name, 'revision': commit.raw_id});
+                    }
                     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}));
                         $this.html(_html);
+                    }
+                }
             });
         e.preventDefault();
+        }
     });
+}

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -524,31 +524,33 @@ @@
                 dropdown.attr('aria-expanded', false);
                 dropdown.find('.dropdown-menu').attr('aria-hidden', true);
             });
         });
     </script>
 </%def>
 <%def name="parent_child_navigation()">
     <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>
     </div>
     <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>
     </div>
     <script type="text/javascript">
       $(document).ready(function(){
           activate_parent_child_links();
       });
     </script>
 </%def>

0 comments (0 inline, 0 general)