commit/galaxy-central: dan: Allow disabling biostar bug reports through config settings.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ff3f9f9ae999/ Changeset: ff3f9f9ae999 User: dan Date: 2014-04-17 18:34:33 Summary: Allow disabling biostar bug reports through config settings. Affected #: 3 files diff -r 9a6cd322371614d9d7569ee806cb07b1dc6a7543 -r ff3f9f9ae9994d8edadcdb2dbd1f9a2ea9efe47b lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -329,6 +329,7 @@ self.biostar_url = kwargs.get( 'biostar_url', None ) self.biostar_key_name = kwargs.get( 'biostar_key_name', None ) self.biostar_key = kwargs.get( 'biostar_key', None ) + self.biostar_enable_bug_reports = string_as_bool( kwargs.get( 'biostar_enable_bug_reports', True ) ) self.pretty_datetime_format = expand_pretty_datetime_format( kwargs.get( 'pretty_datetime_format', '$locale (UTC)' ) ) self.master_api_key = kwargs.get( 'master_api_key', None ) if self.master_api_key == "changethis": # default in sample config file diff -r 9a6cd322371614d9d7569ee806cb07b1dc6a7543 -r ff3f9f9ae9994d8edadcdb2dbd1f9a2ea9efe47b lib/galaxy/util/biostar.py --- a/lib/galaxy/util/biostar.py +++ b/lib/galaxy/util/biostar.py @@ -139,6 +139,7 @@ class BiostarErrorReporter( ErrorReporter ): def _send_report( self, user, email=None, message=None, **kwd ): assert biostar_enabled( self.app ), ValueError( "Biostar is not configured for this galaxy instance" ) + assert self.app.config.biostar_enable_bug_reports, ValueError( "Biostar is not configured to allow bug reporting for this galaxy instance" ) assert self._can_access_dataset( user ), Exception( "You are not allowed to access this dataset." ) tool_version_select_field, tools, tool = \ self.app.toolbox.get_tool_components( self.tool_id, tool_version=None, get_loaded_tools_by_lineage=False, set_selected=True ) diff -r 9a6cd322371614d9d7569ee806cb07b1dc6a7543 -r ff3f9f9ae9994d8edadcdb2dbd1f9a2ea9efe47b templates/webapps/galaxy/dataset/errors.mako --- a/templates/webapps/galaxy/dataset/errors.mako +++ b/templates/webapps/galaxy/dataset/errors.mako @@ -103,7 +103,7 @@ </div><div class="form-row"><input type="submit" name="submit_error_report" value="Report" onclick="return sendReport( this, this.form, '_self' );"/> - %if trans.app.config.biostar_url: + %if trans.app.config.biostar_url and trans.app.config.biostar_enable_bug_reports: <input type="submit" name="submit_error_report" value="Post on Biostar" onclick="return sendReport( this, this.form, '_blank', true );"/> %endif </div> 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.
participants (1)
-
commits-noreply@bitbucket.org