diff --git a/lib/galaxy/webapps/galaxy/controllers/page.py b/lib/galaxy/webapps/galaxy/controllers/page.py index 70e5f1577f0..0e07d0a43a8 100644 --- a/lib/galaxy/webapps/galaxy/controllers/page.py +++ b/lib/galaxy/webapps/galaxy/controllers/page.py @@ -1012,11 +1012,28 @@ def _placeholderRenderForSave(trans, item_class, item_id): decoded_item_id = int(item_id) except ValueError: decoded_item_id = trans.app.security.decode_id(item_id) + item_name = '' + if item_class == 'History': + history = trans.sa_session.query(trans.model.History).get(decoded_item_id) + history = managers.base.security_check(trans, history, False, True) + item_name = history.name + elif item_class == 'HistoryDatasetAssociation': + hda = trans.sa_session.query(trans.model.HistoryDatasetAssociation).get(decoded_item_id) + history = managers.base.security_check(trans, hda , False, True) + item_name = hda.name + elif item_class == 'StoredWorkflow': + wf = trans.sa_session.query(trans.model.StoredWorkflow).get(decoded_item_id) + wf = managers.base.security_check(trans, wf, False, True) + item_name = wf.name + elif item_class == 'Visualization': + visualization = trans.sa_session.query(trans.model.Visualization).get(decoded_item_id) + visualization = managers.base.security_check(trans, visualization, False, True) + item_name = visualization.title class_shorthand = PAGE_CLASS_MAPPING[item_class] return PLACEHOLDER_TEMPLATE.format( item_class=item_class, class_shorthand=class_shorthand, class_shorthand_lower=class_shorthand.lower(), item_id=decoded_item_id, - item_name='' + item_name=item_name ) diff --git a/scripts/page_to_raw.py b/scripts/page_to_raw.py index 073462ab000..93d1af7fa2f 100644 --- a/scripts/page_to_raw.py +++ b/scripts/page_to_raw.py @@ -32,7 +32,7 @@ def main(argv): model = galaxy.config.init_models_from_config(config, object_store=object_store) session = model.context.current pagerevs = session.query(model.PageRevision).all() - mock_trans = Bunch(app=Bunch(security=security_helper), sa_session=session) + mock_trans = Bunch(app=Bunch(security=security_helper), model=model, user_is_admin=lambda: True, sa_session=session) try: for p in pagerevs: processor = _PageContentProcessor(mock_trans, _placeholderRenderForSave)