kallithea Changeset - 04242759b61e

Changeset - 04242759b61e

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Marcin Kuzminski - 12 years ago 2013-06-12 10:21:56
marcin@python-works.com

fixed issue with formatting escaping on url used in changelog js.
Switched everything to pyroutes

1 file changed with 19 insertions and 13 deletions:

rhodecode/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -145,13 +145,16 @@ ${self.context_bar('changelog')} @@
         <script type="text/javascript">
             YAHOO.util.Event.onDOMReady(function(){
                 //Monitor range checkboxes and build a link to changesets
                 //ranges
                 var checkboxes = YUD.getElementsByClassName('changeset_range');
                 var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}";
                 // register our routes needed for this view
                 pyroutes.register('changeset_home', "${h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']);
                 pyroutes.register('changelog_home', "${h.url('changelog_home', repo_name='%(repo_name)s')}", ['repo_name']);
                 pyroutes.register('pullrequest_home', "${h.url('pullrequest_home', repo_name='%(repo_name)s')}", ['repo_name']);
                 var checkbox_checker = function(e){
                     var checked_checkboxes = [];
                     for (pos in checkboxes){
                         if(checkboxes[pos].checked){
                             checked_checkboxes.push(checkboxes[pos]);
@@ @@ -170,36 +173,42 @@ ${self.context_bar('changelog')} @@
+                        }
+                    }
                     if(checked_checkboxes.length>0){
                         var rev_end = checked_checkboxes[0].name;
                         var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
                         var url = url_tmpl.replace('__REVRANGE__',
                                 rev_start+'...'+rev_end);
                         var url = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}',
                                                                   'revision': rev_start+'...'+rev_end});
                         var link = (rev_start == rev_end)
                             ? _TM['Show selected changeset __S']
                             : _TM['Show selected changesets __S -> __E'];
                         link = link.replace('__S',rev_start.substr(0,6));
                         link = link.replace('__E',rev_end.substr(0,6));
                         YUD.get('rev_range_container').href = url;
                         YUD.get('rev_range_container').innerHTML = link;
                         YUD.setStyle('rev_range_container','display','');
                         YUD.setStyle('rev_range_clear','display','');
                         var pr_tmpl = "${h.url('pullrequest_home',repo_name=c.repo_name,rev_start='{0}',rev_end='{1}')}";
                         YUD.get('open_new_pr').href = pr_tmpl.format(rev_start,rev_end);
                         YUD.get('open_new_pr').href = pyroutes.url('pullrequest_home',
                                                                    {'repo_name': '${c.repo_name}',
                                                                     'rev_start': rev_start,
                                                                     'rev_end': rev_end})
                         YUD.setStyle('compare_fork','display','none');
                     }else{
                         YUD.setStyle('rev_range_container','display','none');
                         YUD.setStyle('rev_range_clear','display','none');
                         %if c.branch_name:
                             YUD.get('open_new_pr').href = "${h.url('pullrequest_home',repo_name=c.repo_name,branch=c.branch_name)}";
                             YUD.get('open_new_pr').href = pyroutes.url('pullrequest_home',
                                                                        {'repo_name': '${c.repo_name}',
                                                                         'branch':'${c.branch_name}'});
                         %else:
                             YUD.get('open_new_pr').href = "${h.url('pullrequest_home',repo_name=c.repo_name)}";
                             YUD.get('open_new_pr').href = pyroutes.url('pullrequest_home',
                                                                        {'repo_name': '${c.repo_name}'});
                         %endif
                         YUD.setStyle('compare_fork','display','');
+                    }
                 };
                 YUE.onDOMReady(checkbox_checker);
                 YUE.on(checkboxes,'click', checkbox_checker);
@@ @@ -241,21 +250,18 @@ ${self.context_bar('changelog')} @@
                 });
                 // change branch filter
                 YUE.on(YUD.get('branch_filter'),'change',function(e){
                     var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;
                     var url_main = "${h.url('changelog_home',repo_name=c.repo_name)}";
                     var url = "${h.url('changelog_home',repo_name=c.repo_name,branch='__BRANCH__')}";
                     var url = url.replace('__BRANCH__', encodeURIComponent(selected_branch));
                     if(selected_branch != ''){
                         window.location = url;
                         window.location = pyroutes.url('changelog_home', {'repo_name': '${c.repo_name}',
                                                                           'branch':encodeURIComponent(selected_branch)});
                     }else{
-                        window.location = url_main;
+                        window.location = pyroutes.url('changelog_home', {'repo_name': '${c.repo_name}'});
+                    }
                 });
                 function set_canvas(width) {
                     var c = document.getElementById('graph_nodes');
                     var t = document.getElementById('graph_content');
                     canvas = document.getElementById('graph_canvas');

0 comments (0 inline, 0 general)