1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/b87e47a7c193/ changeset: b87e47a7c193 user: greg date: 2011-08-15 15:18:52 summary: Change the bugs_email config setting to be the url to our new support wiki. affected #: 8 files (2.6 KB) --- a/community_wsgi.ini.sample Sun Aug 14 19:49:26 2011 -0400 +++ b/community_wsgi.ini.sample Mon Aug 15 09:18:52 2011 -0400 @@ -55,6 +55,9 @@ # path to sendmail sendmail_path = /usr/sbin/sendmail +# The URL linked by the "Support" link in the "Help" menu. +#support_url = http://wiki.g2.bx.psu.edu/Support + # Write thread status periodically to 'heartbeat.log' (careful, uses disk space rapidly!) ## use_heartbeat = True --- a/lib/galaxy/config.py Sun Aug 14 19:49:26 2011 -0400 +++ b/lib/galaxy/config.py Mon Aug 15 09:18:52 2011 -0400 @@ -106,7 +106,6 @@ self.brand = kwargs.get( 'brand', None ) self.support_url = kwargs.get( 'support_url', 'http://wiki.g2.bx.psu.edu/Support' ) self.wiki_url = kwargs.get( 'wiki_url', 'http://g2.trac.bx.psu.edu/' ) - self.bugs_email = kwargs.get( 'bugs_email', None ) self.blog_url = kwargs.get( 'blog_url', None ) self.screencasts_url = kwargs.get( 'screencasts_url', None ) self.library_import_dir = kwargs.get( 'library_import_dir', None ) --- a/lib/galaxy/web/controllers/root.py Sun Aug 14 19:49:26 2011 -0400 +++ b/lib/galaxy/web/controllers/root.py Mon Aug 15 09:18:52 2011 -0400 @@ -484,49 +484,6 @@ except: return trans.show_error_message( "<p>Failed to make secondary dataset primary.</p>" ) - # @web.expose - # def masthead( self, trans, active_view=None ): - # brand = trans.app.config.get( "brand", "" ) - # if brand: - # brand ="<span class='brand'>/%s</span>" % brand - # wiki_url = trans.app.config.get( "wiki_url", "http://g2.trac.bx.psu.edu/" ) - # bugs_email = trans.app.config.get( "bugs_email", "mailto:galaxy-bugs@bx.psu.edu" ) - # blog_url = trans.app.config.get( "blog_url", "http://g2.trac.bx.psu.edu/blog" ) - # screencasts_url = trans.app.config.get( "screencasts_url", "http://g2.trac.bx.psu.edu/wiki/ScreenCasts" ) - # admin_user = "false" - # admin_users = trans.app.config.get( "admin_users", "" ).split( "," ) - # user = trans.get_user() - # if user: - # user_email = trans.get_user().email - # if user_email in admin_users: - # admin_user = "true" - # return trans.fill_template( "/root/masthead.mako", brand=brand, wiki_url=wiki_url, - # blog_url=blog_url,bugs_email=bugs_email, screencasts_url=screencasts_url, admin_user=admin_user, active_view=active_view ) - - # @web.expose - # def dataset_errors( self, trans, id=None, **kwd ): - # """View/fix errors associated with dataset""" - # data = trans.app.model.HistoryDatasetAssociation.get( id ) - # p = kwd - # if p.get("fix_errors", None): - # # launch tool to create new, (hopefully) error free dataset - # tool_params = {} - # tool_params["tool_id"] = 'fix_errors' - # tool_params["runtool_btn"] = 'T' - # tool_params["input"] = id - # tool_params["ext"] = data.ext - # # send methods selected - # repair_methods = data.datatype.repair_methods( data ) - # methods = [] - # for method, description in repair_methods: - # if method in p: methods.append(method) - # tool_params["methods"] = ",".join(methods) - # url = "/tool_runner/index?" + urllib.urlencode(tool_params) - # trans.response.send_redirect(url) - # else: - # history = trans.app.model.History.get( data.history_id ) - # return trans.fill_template('dataset/validation.tmpl', data=data, history=history) - # ---- Debug methods ---------------------------------------------------- @web.expose --- a/lib/galaxy/web/controllers/user.py Sun Aug 14 19:49:26 2011 -0400 +++ b/lib/galaxy/web/controllers/user.py Mon Aug 15 09:18:52 2011 -0400 @@ -109,10 +109,10 @@ action = 'login' if auto_associate: action = 'openid_manage' - if trans.app.config.bugs_email is not None: - contact = '<a href="mailto:%s">contact support</a>' % trans.app.config.bugs_email + if trans.app.config.support_url is not None: + contact = '<a href="%s">support</a>' % trans.app.config.support_url else: - contact = 'contact support' + contact = 'support' message = 'Verification failed for an unknown reason. Please contact support for assistance.' status = 'error' consumer = trans.app.openid_manager.get_consumer( trans ) --- a/lib/galaxy/webapps/community/config.py Sun Aug 14 19:49:26 2011 -0400 +++ b/lib/galaxy/webapps/community/config.py Mon Aug 15 09:18:52 2011 -0400 @@ -66,7 +66,6 @@ self.brand = kwargs.get( 'brand', None ) self.support_url = kwargs.get( 'support_url', 'http://wiki.g2.bx.psu.edu/Support' ) self.wiki_url = kwargs.get( 'wiki_url', 'http://wiki.g2.bx.psu.edu/FrontPage' ) - self.bugs_email = kwargs.get( 'bugs_email', None ) self.blog_url = kwargs.get( 'blog_url', None ) self.screencasts_url = kwargs.get( 'screencasts_url', None ) self.log_events = False --- a/lib/galaxy/webapps/demo_sequencer/config.py Sun Aug 14 19:49:26 2011 -0400 +++ b/lib/galaxy/webapps/demo_sequencer/config.py Mon Aug 15 09:18:52 2011 -0400 @@ -50,7 +50,6 @@ self.log_actions = string_as_bool( kwargs.get( 'log_actions', 'False' ) ) self.brand = kwargs.get( 'brand', None ) self.wiki_url = kwargs.get( 'wiki_url', 'http://wiki.g2.bx.psu.edu/FrontPage' ) - self.bugs_email = kwargs.get( 'bugs_email', None ) self.blog_url = kwargs.get( 'blog_url', None ) self.screencasts_url = kwargs.get( 'screencasts_url', None ) self.log_events = False --- a/lib/galaxy/webapps/reports/config.py Sun Aug 14 19:49:26 2011 -0400 +++ b/lib/galaxy/webapps/reports/config.py Mon Aug 15 09:18:52 2011 -0400 @@ -34,7 +34,6 @@ self.log_actions = string_as_bool( kwargs.get( 'log_actions', 'False' ) ) self.brand = kwargs.get( 'brand', None ) self.wiki_url = kwargs.get( 'wiki_url', 'http://wiki.g2.bx.psu.edu/FrontPage' ) - self.bugs_email = kwargs.get( 'bugs_email', None ) self.blog_url = kwargs.get( 'blog_url', None ) self.screencasts_url = kwargs.get( 'screencasts_url', None ) self.log_events = False --- a/universe_wsgi.ini.sample Sun Aug 14 19:49:26 2011 -0400 +++ b/universe_wsgi.ini.sample Mon Aug 15 09:18:52 2011 -0400 @@ -210,8 +210,8 @@ # The URL linked by the "Galaxy Wiki" link in the "Help" menu. #wiki_url = http://wiki.g2.bx.psu.edu/ -# The URL linked by the "Email comments..." link in the "Help" menu. -#bugs_email = mailto:galaxy-bugs@bx.psu.edu +# The URL linked by the "Support" link in the "Help" menu. +#support_url = http://wiki.g2.bx.psu.edu/Support # The URL linked by the "How to Cite..." link in the "Help" menu. #citation_url = http://wiki.g2.bx.psu.edu/Citing%20Galaxy 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.