Reverse order of job manager and instance in warning

This commit is contained in:
Ross Lazarus
2012-05-25 15:48:49 +10:00
parent 32900a81d4
commit 093144b1cd
+1 -1
View File
@@ -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'