1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/e059dbc01b57/ Changeset: e059dbc01b57 User: dan Date: 2014-02-28 21:02:07 Summary: UI fixes for Configure workflow menu. Affected #: 2 files diff -r 410a13e7e8ddabf9a00ffb8ba3bc75d4948447e4 -r e059dbc01b575b856509c2e2baccac3750b6eeb5 lib/galaxy/webapps/galaxy/controllers/workflow.py --- a/lib/galaxy/webapps/galaxy/controllers/workflow.py +++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py @@ -1557,23 +1557,28 @@ m.stored_workflow = q.get( id ) user.stored_workflow_menu_entries.append( m ) sess.flush() - return trans.show_message( "Menu updated", refresh_frames=['tools'] ) + message = "Menu updated" + refresh_frames = ['tools'] else: - user = trans.get_user() - ids_in_menu = set( [ x.stored_workflow_id for x in user.stored_workflow_menu_entries ] ) - workflows = trans.sa_session.query( model.StoredWorkflow ) \ - .filter_by( user=user, deleted=False ) \ - .order_by( desc( model.StoredWorkflow.table.c.update_time ) ) \ - .all() - shared_by_others = trans.sa_session \ - .query( model.StoredWorkflowUserShareAssociation ) \ - .filter_by( user=user ) \ - .filter( model.StoredWorkflow.deleted == False ) \ - .all() - return trans.fill_template( "workflow/configure_menu.mako", - workflows=workflows, - shared_by_others=shared_by_others, - ids_in_menu=ids_in_menu ) + message = None + refresh_frames = [] + user = trans.get_user() + ids_in_menu = set( [ x.stored_workflow_id for x in user.stored_workflow_menu_entries ] ) + workflows = trans.sa_session.query( model.StoredWorkflow ) \ + .filter_by( user=user, deleted=False ) \ + .order_by( desc( model.StoredWorkflow.table.c.update_time ) ) \ + .all() + shared_by_others = trans.sa_session \ + .query( model.StoredWorkflowUserShareAssociation ) \ + .filter_by( user=user ) \ + .filter( model.StoredWorkflow.deleted == False ) \ + .all() + return trans.fill_template( "workflow/configure_menu.mako", + workflows=workflows, + shared_by_others=shared_by_others, + ids_in_menu=ids_in_menu, + message=message, + refresh_frames=['tools'] ) def _workflow_to_svg_canvas( self, trans, stored ): workflow = stored.latest_workflow diff -r 410a13e7e8ddabf9a00ffb8ba3bc75d4948447e4 -r e059dbc01b575b856509c2e2baccac3750b6eeb5 templates/webapps/galaxy/workflow/configure_menu.mako --- a/templates/webapps/galaxy/workflow/configure_menu.mako +++ b/templates/webapps/galaxy/workflow/configure_menu.mako @@ -1,7 +1,19 @@ -<%inherit file="/base.mako"/> +<%inherit file="/webapps/galaxy/base_panels.mako"/> + +<%def name="init()"> +<% + self.has_left_panel=False + self.has_right_panel=False + self.active_view="workflow" + self.message_box_visible=False +%> +</%def><%def name="title()">Configure workflow menu</%def> +<%def name="center_panel()"> + <div style="overflow: auto; height: 100%;"> + <div class="page-container" style="padding: 10px;"> %if message: <% try: @@ -69,9 +81,18 @@ %endif +%if not workflows and not shared_by_others: + <tr> + <td colspan="4">You do not have any accessible workflows.</td> + </tr> +%endif + </table><p /> -<input type="Submit" /> +<input type="Submit" value="Save" /></form> + </div> + </div> +</%def> \ No newline at end of file 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.