From 093144b1cd264d6c54ca57f32a596bd31a329f3b Mon Sep 17 00:00:00 2001 From: Ross Lazarus Date: Fri, 25 May 2012 15:48:49 +1000 Subject: [PATCH] Reverse order of job manager and instance in warning --- lib/galaxy/web/base/controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/web/base/controller.py b/lib/galaxy/web/base/controller.py index ba80c822bd5..7b64c65361a 100644 --- a/lib/galaxy/web/base/controller.py +++ b/lib/galaxy/web/base/controller.py @@ -2380,7 +2380,7 @@ class Admin( object ): msg = None status = None if self.app.config.job_manager != self.app.config.server_name: - return trans.show_error_message( 'This Galaxy instance (%s) is not the job manager (%s). If using multiple servers, please directly access the job manager instance to manage jobs.' % ( self.app.config.job_manager,self.app.config.server_name) ) + return trans.show_error_message( 'This Galaxy instance (%s) is not the job manager (%s). If using multiple servers, please directly access the job manager instance to manage jobs.' % (self.app.config.server_name, self.app.config.job_manager) ) job_ids = util.listify( stop ) if job_ids and stop_msg in [ None, '' ]: msg = 'Please enter an error message to display to the user describing why the job was terminated'