[hg] galaxy 1572: Fix a bug from the last commit, what I changed...

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[hg] galaxy 1572: Fix a bug from the last commit, what I changed...

Nate Coraor (nate@bx.psu.edu)
details:   http://www.bx.psu.edu/hg/galaxy/rev/f2ce31c74346
changeset: 1572:f2ce31c74346
user:      Nate Coraor <[hidden email]>
date:      Thu Oct 23 15:19:48 2008 -0400
description:
Fix a bug from the last commit, what I changed doesn't work right.

2 file(s) affected in this change:

lib/galaxy/datatypes/interval.py
templates/root/history_common.mako

diffs (50 lines):

diff -r 6e592c876f4d -r f2ce31c74346 lib/galaxy/datatypes/interval.py
--- a/lib/galaxy/datatypes/interval.py Thu Oct 23 15:02:23 2008 -0400
+++ b/lib/galaxy/datatypes/interval.py Thu Oct 23 15:19:48 2008 -0400
@@ -9,6 +9,7 @@
 import data
 from galaxy import util
 from galaxy.datatypes.sniff import *
+from galaxy.web import url_for
 from cgi import escape
 import urllib
 from bx.intervals.io import *
@@ -217,7 +218,7 @@
                 stop = viewport_tuple[2]
                 for site_name, site_url in util.get_ucsc_by_build(dataset.dbkey):
                     if site_name in app.config.ucsc_display_sites:
-                        display_url = urllib.quote_plus( "%s/display_as?id=%i&display_app=%s" % (base_url, dataset.id, type) )
+                        display_url = urllib.quote_plus( "%s%s/display_as?id=%i&display_app=%s" % (base_url, url_for( controller='root' ), dataset.id, type) )
                         link = "%sdb=%s&position=%s:%s-%s&hgt.customText=%s" % (site_url, dataset.dbkey, chrom, start, stop, display_url )
                         ret_val.append( (site_name, link) )
         return ret_val
@@ -810,7 +811,7 @@
                 stop = viewport_tuple[2]
                 for site_name, site_url in util.get_ucsc_by_build(dataset.dbkey):
                     if site_name in app.config.ucsc_display_sites:
-                        display_url = urllib.quote_plus( "%s/display_as?id=%i&display_app=%s" % (base_url, dataset.id, type) )
+                        display_url = urllib.quote_plus( "%s%s/display_as?id=%i&display_app=%s" % (base_url, url_for( controller='root' ), dataset.id, type) )
                         link = "%sdb=%s&position=%s:%s-%s&hgt.customText=%s" % (site_url, dataset.dbkey, chrom, start, stop, display_url )
                         ret_val.append( (site_name, link) )
         return ret_val
@@ -889,7 +890,7 @@
                 stop = viewport_tuple[2]
                 for site_name, site_url in util.get_gbrowse_sites_by_build(dataset.dbkey):
                     if site_name in app.config.gbrowse_display_sites:
-                        display_url = urllib.quote_plus( "%s/display_as?id=%i&display_app=%s" % (base_url, dataset.id, type) )
+                        display_url = urllib.quote_plus( "%s%s/display_as?id=%i&display_app=%s" % (base_url, url_for( controller='root' ), dataset.id, type) )
                         link = "%sname=%s&ref=%s:%s..%s&eurl=%s" % (site_url, dataset.dbkey, chrom, start, stop, display_url )                        
                         ret_val.append( (site_name, link) )
         return ret_val
diff -r 6e592c876f4d -r f2ce31c74346 templates/root/history_common.mako
--- a/templates/root/history_common.mako Thu Oct 23 15:02:23 2008 -0400
+++ b/templates/root/history_common.mako Thu Oct 23 15:19:48 2008 -0400
@@ -67,7 +67,7 @@
                     %if data.has_data:
                         <a href="${h.url_for( action='display', id=data.id, tofile='yes', toext=data.ext )}" target="_blank">save</a>
                         %for display_app in data.datatype.get_display_types():
-                            <% display_links = data.datatype.get_display_links( data, display_app, app, request.base + h.url_for() ) %>
+                            <% display_links = data.datatype.get_display_links( data, display_app, app, request.base ) %>
                             %if len( display_links ) > 0:
                                 | ${data.datatype.get_display_label(display_app)}
  %for display_name, display_link in display_links: