1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/8335baa68815/
changeset: 8335baa68815
user: fubar
date: 2012-05-25 07:48:49
summary: Reverse order of job manager and instance in warning
affected #: 1 file
diff -r 3f1150fee33c6d7270549e0760fd84b7c35fdb50 -r 8335baa6881520cabfd3eb41986d7df203dc3183 lib/galaxy/web/base/controller.py
--- a/lib/galaxy/web/base/controller.py
+++ b/lib/galaxy/web/base/controller.py
@@ -2380,7 +2380,7 @@
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'
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/3f1150fee33c/
changeset: 3f1150fee33c
user: fubar
date: 2012-05-25 07:40:44
summary: Fix for bogus double negative compare - allows job management from admin screen when only one job manager running
affected #: 1 file
diff -r 3fa05d052e820d21f1a6e5ae206d90edcc1a8782 -r 3f1150fee33c6d7270549e0760fd84b7c35fdb50 lib/galaxy/web/base/controller.py
--- a/lib/galaxy/web/base/controller.py
+++ b/lib/galaxy/web/base/controller.py
@@ -2379,8 +2379,8 @@
deleted = []
msg = None
status = None
- if not self.app.config.job_manager != self.app.config.server_name:
- return trans.show_error_message( 'This Galaxy instance is not the job manager. If using multiple servers, please directly access the job manager instance to manage jobs.' )
+ 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) )
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'
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/3fa05d052e82/
changeset: 3fa05d052e82
user: greg
date: 2012-05-24 22:47:25
summary: Fix a typo in the community common cntroller.
affected #: 1 file
diff -r 676546e7038ae833e524bbc4b4b26c81c71954bd -r 3fa05d052e820d21f1a6e5ae206d90edcc1a8782 lib/galaxy/webapps/community/controllers/common.py
--- a/lib/galaxy/webapps/community/controllers/common.py
+++ b/lib/galaxy/webapps/community/controllers/common.py
@@ -774,7 +774,7 @@
break
if in_ctx:
tmp_tool_config = get_named_tmpfile_from_ctx( ctx, ctx_file, dir=work_dir )
- element_tree = util.parse_xml( tmp_config )
+ element_tree = util.parse_xml( tmp_tool_config )
element_tree_root = element_tree.getroot()
# Look for code files required by the tool config.
tmp_code_files = []
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.