# HG changeset patch # User Marcin Kuzminski # Date 1371025316 -7200 # Node ID 04242759b61e24a488322bd9f3cbe585c4efc756 # Parent 4f31439c90d371007ae693a5f1324a8deeb4eb8a fixed issue with formatting escaping on url used in changelog js. Switched everything to pyroutes diff -r 4f31439c90d3 -r 04242759b61e rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html Wed Jun 12 01:36:35 2013 +0200 +++ b/rhodecode/templates/changelog/changelog.html Wed Jun 12 10:21:56 2013 +0200 @@ -148,7 +148,10 @@ //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 = []; @@ -173,8 +176,8 @@ 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'] @@ -187,16 +190,22 @@ 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',''); } @@ -244,15 +253,12 @@ // 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) {