details: http://www.bx.psu.edu/hg/galaxy/rev/4dfbf68c8c7e changeset: 3254:4dfbf68c8c7e user: jeremy goecks <jeremy.goecks@emory.edu> date: Wed Jan 20 13:19:05 2010 -0500 description: Updated 'Share' option in history menu to 'Share and Publish' and made corresponding controller changes. diffstat: lib/galaxy/web/controllers/history.py | 6 +++--- templates/root/index.mako | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diffs (34 lines): diff -r 0a8d73234704 -r 4dfbf68c8c7e lib/galaxy/web/controllers/history.py --- a/lib/galaxy/web/controllers/history.py Wed Jan 20 12:26:13 2010 -0500 +++ b/lib/galaxy/web/controllers/history.py Wed Jan 20 13:19:05 2010 -0500 @@ -516,13 +516,13 @@ # Get session and histories. session = trans.sa_session + # Id values take precedence over histories passed in; last resort is current history. if id: ids = util.listify( id ) if ids: histories = [ self.get_history( trans, history_id ) for history_id in ids ] - else: - # Use histories passed in. - pass + elif not histories: + histories = [ trans.history ] # Do operation on histories. for history in histories: diff -r 0a8d73234704 -r 4dfbf68c8c7e templates/root/index.mako --- a/templates/root/index.mako Wed Jan 20 12:26:13 2010 -0500 +++ b/templates/root/index.mako Wed Jan 20 13:19:05 2010 -0500 @@ -23,8 +23,8 @@ "Clone": function() { galaxy_main.location = "${h.url_for( controller='history', action='clone')}"; }, - "Share": function() { - galaxy_main.location = "${h.url_for( controller='history', action='share' )}"; + "Share or Publish": function() { + galaxy_main.location = "${h.url_for( controller='history', action='sharing' )}"; }, "Extract Workflow": function() { galaxy_main.location = "${h.url_for( controller='workflow', action='build_from_current_history' )}";