2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c3af74bfc026/ Changeset: c3af74bfc026 User: dannon Date: 2015-01-22 23:05:11+00:00 Summary: Import cleanup in history controller. Affected #: 1 file diff -r ef878dcd878a7a59189a36a29c61e23ac8b571aa -r c3af74bfc02696f59b160c1f43fc31653105710a lib/galaxy/webapps/galaxy/controllers/history.py --- a/lib/galaxy/webapps/galaxy/controllers/history.py +++ b/lib/galaxy/webapps/galaxy/controllers/history.py @@ -1,31 +1,26 @@ import logging -from cgi import escape -from traceback import format_exc import urllib import galaxy.util -from galaxy import model -from galaxy import web from galaxy import exceptions from galaxy import managers +from galaxy import model +from galaxy import util +from galaxy import web from galaxy.datatypes.data import nice_size +from galaxy.model.item_attrs import UsesAnnotations +from galaxy.model.item_attrs import UsesItemRatings from galaxy.model.orm import and_, eagerload_all, func -from galaxy import util from galaxy.util import Params from galaxy.util.odict import odict from galaxy.util.sanitize_html import sanitize_html -from galaxy.web import error, url_for - +from galaxy.web import url_for from galaxy.web.base.controller import BaseUIController -from galaxy.web.base.controller import SharableMixin +from galaxy.web.base.controller import ERROR, INFO, SUCCESS, WARNING from galaxy.web.base.controller import ExportsHistoryMixin from galaxy.web.base.controller import ImportsHistoryMixin -from galaxy.model.item_attrs import UsesAnnotations -from galaxy.model.item_attrs import UsesItemRatings - -from galaxy.web.base.controller import ERROR, INFO, SUCCESS, WARNING - -from galaxy.web.framework.helpers import grids, iff, time_ago, escape +from galaxy.web.base.controller import SharableMixin +from galaxy.web.framework.helpers import escape, grids, iff, time_ago log = logging.getLogger( __name__ ) https://bitbucket.org/galaxy/galaxy-central/commits/8ad307615510/ Changeset: 8ad307615510 User: dannon Date: 2015-01-22 23:07:19+00:00 Summary: Remove cruft in history controller. Affected #: 1 file diff -r c3af74bfc02696f59b160c1f43fc31653105710a -r 8ad3076155100bbc841efca1b4e4c91376e11568 lib/galaxy/webapps/galaxy/controllers/history.py --- a/lib/galaxy/webapps/galaxy/controllers/history.py +++ b/lib/galaxy/webapps/galaxy/controllers/history.py @@ -265,7 +265,6 @@ history_ids = galaxy.util.listify( kwargs.get( 'id', [] ) ) # Display no message by default status, message = None, None - refresh_history = False # Load the histories and ensure they all belong to the current user histories = [] for history_id in history_ids: @@ -425,7 +424,6 @@ @web.require_login( "work with shared histories" ) def list_shared( self, trans, **kwargs ): """List histories shared with current user by others""" - msg = galaxy.util.restore_text( kwargs.get( 'msg', '' ) ) status = message = None if 'operation' in kwargs: ids = galaxy.util.listify( kwargs.get( 'id', [] ) ) @@ -999,10 +997,6 @@ # histories looks like: { userA: [ historyX, historyY ], userB: [ historyY ] } histories = histories or {} msg = "" - sent_to_emails = [] - for send_to_user in histories.keys(): - sent_to_emails.append( send_to_user.email ) - emails = ",".join( e for e in sent_to_emails ) if not histories: send_to_err += "No users have been specified or no histories can be sent without changing permissions or associating a sharing role. " else: @@ -1149,7 +1143,7 @@ if not history: return trans.show_error_message( "The specified history does not exist." ) # Rate history. - history_rating = self.rate_item( trans.sa_session, trans.get_user(), history, rating ) + self.rate_item( trans.sa_session, trans.get_user(), history, rating ) return self.get_ave_item_rating_data( trans.sa_session, history ) #TODO: used in display_base.mako @@ -1271,7 +1265,6 @@ @web.expose def imp( self, trans, id=None, confirm=False, **kwd ): """Import another user's history via a shared URL""" - msg = "" user = trans.get_user() user_history = trans.get_history() # Set referer 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.