commit/galaxy-central: dannon: More url_for changes from base controllers.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/3a0e3ef5414a/ changeset: 3a0e3ef5414a user: dannon date: 2013-02-06 03:58:24 summary: More url_for changes from base controllers. affected #: 2 files diff -r cdd8b8a66a980d1761e47f9202114fbcfd218cf7 -r 3a0e3ef5414a06bc7ada75c3acb28affab7c916c lib/galaxy/web/base/controller.py --- a/lib/galaxy/web/base/controller.py +++ b/lib/galaxy/web/base/controller.py @@ -406,7 +406,7 @@ session.add( vis_rev ) session.flush() encoded_id = trans.security.encode_id( vis.id ) - return { "vis_id": encoded_id, "url": url_for( action=vis.type, id=encoded_id ) } + return { "vis_id": encoded_id, "url": url_for( controller='visualization', action=vis.type, id=encoded_id ) } def get_visualization( self, trans, id, check_ownership=True, check_accessible=False ): """ Get a Visualization from the database by id, verifying ownership. """ diff -r cdd8b8a66a980d1761e47f9202114fbcfd218cf7 -r 3a0e3ef5414a06bc7ada75c3acb28affab7c916c lib/galaxy/web/base/controllers/admin.py --- a/lib/galaxy/web/base/controllers/admin.py +++ b/lib/galaxy/web/base/controllers/admin.py @@ -987,18 +987,18 @@ sorts.append( 'None' ) elif new_sort is not None: sorts[-1] = new_sort - breadcrumb = "<a href='%s' class='breadcrumb'>heap</a>" % web.url_for() + breadcrumb = "<a href='%s' class='breadcrumb'>heap</a>" % web.url_for(controller='admin', action='memdump') # new lists so we can assemble breadcrumb links new_ids = [] new_sorts = [] for id, sort in zip( ids, sorts ): new_ids.append( id ) if id != 'None': - breadcrumb += "<a href='%s' class='breadcrumb'>[%s]</a>" % ( web.url_for( ids=','.join( new_ids ), sorts=','.join( new_sorts ) ), id ) + breadcrumb += "<a href='%s' class='breadcrumb'>[%s]</a>" % ( web.url_for(controller='admin', action='memdump', ids=','.join( new_ids ), sorts=','.join( new_sorts ) ), id ) heap = heap[int(id)] new_sorts.append( sort ) if sort != 'None': - breadcrumb += "<a href='%s' class='breadcrumb'>.by('%s')</a>" % ( web.url_for( ids=','.join( new_ids ), sorts=','.join( new_sorts ) ), sort ) + breadcrumb += "<a href='%s' class='breadcrumb'>.by('%s')</a>" % ( web.url_for(controller='admin', action='memdump', ids=','.join( new_ids ), sorts=','.join( new_sorts ) ), sort ) heap = heap.by( sort ) ids = ','.join( new_ids ) sorts = ','.join( new_sorts ) Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
Bitbucket