1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/029818b7e546/ changeset: 029818b7e546 user: smcmanus date: 2012-10-05 02:43:55 summary: The browse_library.mako template referred to galaxy.web.controllers.library_common, which has been updated to galaxy.webapps.galaxy.controllers.library_common. The Data Library browsing should be fixed. affected #: 3 files diff -r f3b183e756f9b209ef0904718ed547e04c74ab7a -r 029818b7e546a3b6835c49ef4f8694c5ac695dfb lib/galaxy/webapps/galaxy/controllers/library_common.py --- a/lib/galaxy/webapps/galaxy/controllers/library_common.py +++ b/lib/galaxy/webapps/galaxy/controllers/library_common.py @@ -131,7 +131,7 @@ comptypes = get_comptypes( trans ) try: # SM: TODO: Add configuration variable asap. - return trans.fill_template( '/library/common/browse_library.mako', + return trans.fill_template( 'library/common/browse_library.mako', cntrller=cntrller, use_panels=use_panels, library=library, @@ -143,6 +143,8 @@ message=message, status=status ) except Exception, e: + import traceback + log.debug( "traceback: %s" % traceback.format_exc() ) message = 'Error attempting to display contents of library (%s): %s.' % ( str( library.name ), str( e ) ) status = 'error' default_action = params.get( 'default_action', None ) diff -r f3b183e756f9b209ef0904718ed547e04c74ab7a -r 029818b7e546a3b6835c49ef4f8694c5ac695dfb lib/galaxy/webapps/galaxy/controllers/requests_admin.py --- a/lib/galaxy/webapps/galaxy/controllers/requests_admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/requests_admin.py @@ -284,6 +284,7 @@ request_id = trans.security.encode_id( sample.request.id ) library_id = trans.security.encode_id( sample.library.id ) self.datatx_grid.title = 'Manage "%s" datasets' % sample.name + log.debug( "!!!!!!!!!!!!!!!!!!!!!!@@@@@@@@@@@@@@@@@@@@@@@##################" ) self.datatx_grid.global_actions = [ grids.GridAction( "Browse target data library", dict( controller='library_common', action='browse_library', diff -r f3b183e756f9b209ef0904718ed547e04c74ab7a -r 029818b7e546a3b6835c49ef4f8694c5ac695dfb templates/library/common/browse_library.mako --- a/templates/library/common/browse_library.mako +++ b/templates/library/common/browse_library.mako @@ -213,7 +213,7 @@ ## children, which are always lddas ). We also need to make sure we're displaying the latest version of this ## library_dataset, so we display the attributes from the ldda. - from galaxy.web.controllers.library_common import branch_deleted + from galaxy.webapps.galaxy.controllers.library_common import branch_deleted is_admin = trans.user_is_admin() and cntrller == 'library_admin' @@ -312,7 +312,7 @@ <%def name="render_folder( cntrller, folder, folder_pad, created_ldda_ids, library, hidden_folder_ids, tracked_datasets, show_deleted=False, parent=None, row_counter=None, root_folder=False, simple=False )"><% - from galaxy.web.controllers.library_common import active_folders, active_folders_and_library_datasets, activatable_folders_and_library_datasets, branch_deleted + from galaxy.webapps.galaxy.controllers.library_common import active_folders, active_folders_and_library_datasets, activatable_folders_and_library_datasets, branch_deleted is_admin = trans.user_is_admin() and cntrller == 'library_admin' has_accessible_library_datasets = trans.app.security_agent.has_accessible_library_datasets( trans, folder, trans.user, current_user_roles, search_downward=False ) @@ -472,7 +472,7 @@ <%def name="render_content(simple=False)"><% from galaxy import util - from galaxy.web.controllers.library_common import branch_deleted + from galaxy.webapps.galaxy.controllers.library_common import branch_deleted from time import strftime is_admin = trans.user_is_admin() and cntrller == 'library_admin' 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.