details: http://www.bx.psu.edu/hg/galaxy/rev/9701e5ee128d changeset: 3506:9701e5ee128d user: Nate Coraor <nate@bx.psu.edu> date: Wed Mar 10 14:25:34 2010 -0500 description: Now that cntrller is passed as a POST var in the upload form, it's not necessary to have the library_admin and library controller upload convenience methods. This should fix broken library tests on the production buildbot. diffstat: lib/galaxy/web/controllers/library.py | 3 --- lib/galaxy/web/controllers/library_admin.py | 4 ---- lib/galaxy/web/controllers/library_common.py | 8 ++------ 3 files changed, 2 insertions(+), 13 deletions(-) diffs (39 lines): diff -r 9efe896dbb17 -r 9701e5ee128d lib/galaxy/web/controllers/library.py --- a/lib/galaxy/web/controllers/library.py Wed Mar 10 11:51:00 2010 -0500 +++ b/lib/galaxy/web/controllers/library.py Wed Mar 10 14:25:34 2010 -0500 @@ -34,6 +34,3 @@ default_action=params.get( 'default_action', None ), msg=msg, messagetype=messagetype ) - @web.expose - def upload_library_dataset( self, trans, library_id, folder_id, **kwd ): - return trans.webapp.controllers[ 'library_common' ].upload_library_dataset( trans, 'library', library_id, folder_id, **kwd ) diff -r 9efe896dbb17 -r 9701e5ee128d lib/galaxy/web/controllers/library_admin.py --- a/lib/galaxy/web/controllers/library_admin.py Wed Mar 10 11:51:00 2010 -0500 +++ b/lib/galaxy/web/controllers/library_admin.py Wed Mar 10 14:25:34 2010 -0500 @@ -235,7 +235,3 @@ show_deleted=show_deleted, msg=msg, messagetype=status ) ) - @web.expose - @web.require_admin - def upload_library_dataset( self, trans, library_id, folder_id, **kwd ): - return trans.webapp.controllers[ 'library_common' ].upload_library_dataset( trans, 'library_admin', library_id, folder_id, **kwd ) diff -r 9efe896dbb17 -r 9701e5ee128d lib/galaxy/web/controllers/library_common.py --- a/lib/galaxy/web/controllers/library_common.py Wed Mar 10 11:51:00 2010 -0500 +++ b/lib/galaxy/web/controllers/library_common.py Wed Mar 10 14:25:34 2010 -0500 @@ -804,12 +804,8 @@ if upload_option == 'upload_file' and trans.app.config.nginx_upload_path: # url_for is intentionally not used on the base URL here - # nginx_upload_path is expected to include the proxy prefix if the - # administrator intends for it to be part of the URL. We also - # redirect to the library or library_admin controller rather than - # library_common because GET arguments can't be used in conjunction - # with nginx upload (nginx can't do percent decoding without a - # bunch of hacky rewrite rules). - action = trans.app.config.nginx_upload_path + '?nginx_redir=' + web.url_for( controller=cntrller, action='upload_library_dataset' ) + # administrator intends for it to be part of the URL. + action = trans.app.config.nginx_upload_path + '?nginx_redir=' + web.url_for( controller='library_common', action='upload_library_dataset' ) return trans.fill_template( '/library/common/upload.mako', cntrller=cntrller, upload_option=upload_option,