1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c8c00d106c7a/ Changeset: c8c00d106c7a User: jmchilton Date: 2014-01-11 04:23:07 Summary: Code duplication reduction in Tool. Affected #: 1 file diff -r 9f55b4b37d35b8366f42ab430ac4213554d83311 -r c8c00d106c7a6883feaacca809b42fd7c107fe2a lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -1834,7 +1834,7 @@ # external data source tools). if "runtool_btn" not in incoming and "URL" not in incoming: if not self.display_interface: - return 'message.mako', dict( status='info', message="The interface for this tool cannot be displayed", refresh_frames=['everything'] ) + return self.__no_display_interface_response() if len(incoming): self.update_state( trans, self.inputs_by_page[state.page], state.inputs, incoming, old_errors=old_errors or {}, source=source ) return "tool_form.mako", dict( errors={}, tool_state=state, param_values={}, incoming={} ) @@ -1894,7 +1894,7 @@ pass # Just a refresh, render the form with updated state and errors. if not self.display_interface: - return 'message.mako', dict( status='info', message="The interface for this tool cannot be displayed", refresh_frames=['everything'] ) + return self.__no_display_interface_response() return 'tool_form.mako', dict( errors=errors, tool_state=state ) def __handle_page_advance( self, trans, state, errors ): @@ -1902,9 +1902,12 @@ # Fill in the default values for the next page self.fill_in_new_state( trans, self.inputs_by_page[ state.page ], state.inputs ) if not self.display_interface: - return 'message.mako', dict( status='info', message="The interface for this tool cannot be displayed", refresh_frames=['everything'] ) + return self.__no_display_interface_response() return 'tool_form.mako', dict( errors=errors, tool_state=state ) + def __no_display_interface_response( self ): + return 'message.mako', dict( status='info', message="The interface for this tool cannot be displayed", refresh_frames=['everything'] ) + def __fetch_state( self, trans, incoming, history, all_pages ): # Get the state or create if not found if "tool_state" in incoming: 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.