1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/210c39f4bf7f/ changeset: 210c39f4bf7f user: smcmanus date: 2012-10-05 03:43:15 summary: Moved galaxy.web.controllers references to galaxy.webapps.galaxy.controllers affected #: 5 files diff -r 2565580bb7cffd28c237ecafab1fbb46fe6185e9 -r 210c39f4bf7f2d91c68df84dd9ccecb2ff9f93aa templates/admin/requests/rename_datasets.mako --- a/templates/admin/requests/rename_datasets.mako +++ b/templates/admin/requests/rename_datasets.mako @@ -1,7 +1,7 @@ <%inherit file="/base.mako"/><%namespace file="/message.mako" import="render_msg" /> -<% from galaxy.web.controllers.requests_admin import build_rename_datasets_for_sample_select_field %> +<% from galaxy.webapps.galaxy.controllers.requests_admin import build_rename_datasets_for_sample_select_field %><h3>Rename datasets for Sample "${sample.name}"</h3> diff -r 2565580bb7cffd28c237ecafab1fbb46fe6185e9 -r 210c39f4bf7f2d91c68df84dd9ccecb2ff9f93aa templates/library/common/browse_library_opt.mako --- a/templates/library/common/browse_library_opt.mako +++ b/templates/library/common/browse_library_opt.mako @@ -214,7 +214,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' current_version = ( ldda == library_dataset.library_dataset_dataset_association ) @@ -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, map_library_datasets_to_lddas, branch_deleted, datasets_for_lddas + from galaxy.webapps.galaxy.controllers.library_common import active_folders, active_folders_and_library_datasets, activatable_folders_and_library_datasets, map_library_datasets_to_lddas, branch_deleted, datasets_for_lddas # SM: DELETEME from datetime import datetime, timedelta @@ -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 import logging log = logging.getLogger( __name__ ) diff -r 2565580bb7cffd28c237ecafab1fbb46fe6185e9 -r 210c39f4bf7f2d91c68df84dd9ccecb2ff9f93aa templates/library/common/ldda_info.mako --- a/templates/library/common/ldda_info.mako +++ b/templates/library/common/ldda_info.mako @@ -3,7 +3,7 @@ <%namespace file="/common/template_common.mako" import="render_template_fields" /><% from galaxy import util - from galaxy.web.controllers.library_common import branch_deleted, get_containing_library_from_library_dataset + from galaxy.webapps.galaxy.controllers.library_common import branch_deleted, get_containing_library_from_library_dataset from galaxy.web.framework.helpers import time_ago if ldda == ldda.library_dataset.library_dataset_dataset_association: diff -r 2565580bb7cffd28c237ecafab1fbb46fe6185e9 -r 210c39f4bf7f2d91c68df84dd9ccecb2ff9f93aa templates/library/common/library_dataset_search_results.mako --- a/templates/library/common/library_dataset_search_results.mako +++ b/templates/library/common/library_dataset_search_results.mako @@ -66,8 +66,7 @@ <%def name="render_content()"><% from galaxy import util - from galaxy.web.controllers.library_common import branch_deleted - #from galaxy.webapps.galaxy.controllers.library_common import branch_deleted + from galaxy.webapps.galaxy.controllers.library_common import branch_deleted from time import strftime class RowCounter( object ): diff -r 2565580bb7cffd28c237ecafab1fbb46fe6185e9 -r 210c39f4bf7f2d91c68df84dd9ccecb2ff9f93aa templates/webapps/reports/dataset_info.mako --- a/templates/webapps/reports/dataset_info.mako +++ b/templates/webapps/reports/dataset_info.mako @@ -4,6 +4,7 @@ <% from galaxy.web.framework.helpers import time_ago from galaxy.web.controllers.library_common import get_containing_library_from_library_dataset + from galaxy.webapps.galaxy.controllers.library_common import get_containing_library_from_library_dataset %> %if message: 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.