- galaxy-commits - lists.galaxyproject.org

commit/galaxy-central: natefoo: Update tag latest_2014.10.06 for changeset adc4aa8b3d9a
by commits-noreply＠bitbucket.org 25 Nov '14

25 Nov '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c50a228167b0/ Changeset: c50a228167b0 Branch: stable User: natefoo Date: 2014-11-25 17:00:20+00:00 Summary: Update tag latest_2014.10.06 for changeset adc4aa8b3d9a Affected #: 1 file diff -r adc4aa8b3d9ad77ef85f8b0d7e4d90bd29775167 -r c50a228167b0a1a4541f46bb19b8d67c9010248d .hgtags --- a/.hgtags +++ b/.hgtags @@ -20,4 +20,4 @@ ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 -bb79e87274d7ef4e043a84aeef8516a5418ef3b6 latest_2014.10.06 +adc4aa8b3d9ad77ef85f8b0d7e4d90bd29775167 latest_2014.10.06 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 0

commit/galaxy-central: 2 new changesets
by commits-noreply＠bitbucket.org 25 Nov '14

25 Nov '14

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/46c3d2a06212/ Changeset: 46c3d2a06212 Branch: next-stable User: JanKanis Date: 2014-11-13 15:48:02+00:00 Summary: use first component of X-Forwarded-{For,Host,Scheme} X-Forwarded-{For,Host,Scheme} can contain multiple comma-separated components if there are multiple reverse proxies. Use the first (outer) one. See http://httpd.apache.org/docs/2.4/mod/mod_proxy.html#x-headers for apache docs. Affected #: 1 file diff -r c1a9ed13d5f71deb671ab83ed262c0a861c469d2 -r 46c3d2a06212b61a0ab14d7790bf1167dc65b653 lib/galaxy/web/framework/middleware/xforwardedhost.py --- a/lib/galaxy/web/framework/middleware/xforwardedhost.py +++ b/lib/galaxy/web/framework/middleware/xforwardedhost.py @@ -9,13 +9,13 @@ x_forwarded_host = environ.get( 'HTTP_X_FORWARDED_HOST', None ) if x_forwarded_host: environ[ 'ORGINAL_HTTP_HOST' ] = environ[ 'HTTP_HOST' ] - environ[ 'HTTP_HOST' ] = x_forwarded_host + environ[ 'HTTP_HOST' ] = x_forwarded_host.split(', ', 1)[0] x_forwarded_for = environ.get( 'HTTP_X_FORWARDED_FOR', None ) if x_forwarded_for: environ[ 'ORGINAL_REMOTE_ADDR' ] = environ[ 'REMOTE_ADDR' ] - environ[ 'REMOTE_ADDR' ] = x_forwarded_for + environ[ 'REMOTE_ADDR' ] = x_forwarded_for.split(', ', 1)[0] x_url_scheme = environ.get( 'HTTP_X_URL_SCHEME', None ) if x_url_scheme: environ[ 'original_wsgi.url_scheme' ] = environ[ 'wsgi.url_scheme' ] - environ[ 'wsgi.url_scheme' ] = x_url_scheme + environ[ 'wsgi.url_scheme' ] = x_url_scheme.split(', ', 1)[0] return self.app( environ, start_response ) https://bitbucket.org/galaxy/galaxy-central/commits/df35b41ceaac/ Changeset: df35b41ceaac Branch: next-stable User: dannon Date: 2014-11-25 16:33:26+00:00 Summary: Remove unnecessary split on wsgi.url_scheme Affected #: 1 file diff -r 46c3d2a06212b61a0ab14d7790bf1167dc65b653 -r df35b41ceaac11150513913f86926a379094b09d lib/galaxy/web/framework/middleware/xforwardedhost.py --- a/lib/galaxy/web/framework/middleware/xforwardedhost.py +++ b/lib/galaxy/web/framework/middleware/xforwardedhost.py @@ -5,6 +5,7 @@ """ def __init__( self, app, global_conf=None ): self.app = app + def __call__( self, environ, start_response ): x_forwarded_host = environ.get( 'HTTP_X_FORWARDED_HOST', None ) if x_forwarded_host: @@ -17,5 +18,5 @@ x_url_scheme = environ.get( 'HTTP_X_URL_SCHEME', None ) if x_url_scheme: environ[ 'original_wsgi.url_scheme' ] = environ[ 'wsgi.url_scheme' ] - environ[ 'wsgi.url_scheme' ] = x_url_scheme.split(', ', 1)[0] + environ[ 'wsgi.url_scheme' ] = x_url_scheme return self.app( environ, start_response ) 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 0

commit/galaxy-central: jmchilton: Sanitize object names throughout templates.
by commits-noreply＠bitbucket.org 25 Nov '14

25 Nov '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/adc4aa8b3d9a/ Changeset: adc4aa8b3d9a Branch: stable User: jmchilton Date: 2014-11-24 15:06:11+00:00 Summary: Sanitize object names throughout templates. Affected #: 7 files diff -r cae8a513079a183d16bd8a16b915d6aa5322a249 -r adc4aa8b3d9ad77ef85f8b0d7e4d90bd29775167 templates/display_base.mako --- a/templates/display_base.mako +++ b/templates/display_base.mako @@ -214,7 +214,7 @@ %else: Private ${get_class_display_name( item.__class__ )} %endif - | ${get_item_name( item )} + | ${get_item_name( item ) | h} <div style="float: right"> ${self.render_item_links( item )} diff -r cae8a513079a183d16bd8a16b915d6aa5322a249 -r adc4aa8b3d9ad77ef85f8b0d7e4d90bd29775167 templates/embed_base.mako --- a/templates/embed_base.mako +++ b/templates/embed_base.mako @@ -49,7 +49,7 @@ <div style="float: right;"> ${self.render_item_links( item )} </div> - <h4><a class="toggle-embed" href="${display_href}" title="Show or hide ${item_display_name} content">Galaxy ${get_class_display_name( item.__class__ )} | ${get_item_name( item )}</a></h4> + <h4><a class="toggle-embed" href="${display_href}" title="Show or hide ${item_display_name} content">Galaxy ${get_class_display_name( item.__class__ )} | ${get_item_name( item ) | h}</a></h4> %if hasattr( item, "annotation") and item.annotation: <div class="annotation">${item.annotation}</div> %endif diff -r cae8a513079a183d16bd8a16b915d6aa5322a249 -r adc4aa8b3d9ad77ef85f8b0d7e4d90bd29775167 templates/export_base.mako --- a/templates/export_base.mako +++ b/templates/export_base.mako @@ -42,7 +42,7 @@ </%def><%def name="title()"> - Export ${get_class_display_name( item.__class__ )} '${get_item_name( item )}' + Export ${get_class_display_name( item.__class__ )} '${get_item_name( item ) | h}' </%def><%def name="stylesheets()"> @@ -108,7 +108,7 @@ <% item_name = get_item_name(item) %> - <h2>Download or Export ${self.item_class_name} '${item_name}'</h2> + <h2>Download or Export ${self.item_class_name} '${item_name | h}'</h2> ${self.render_download_to_file(item)} diff -r cae8a513079a183d16bd8a16b915d6aa5322a249 -r adc4aa8b3d9ad77ef85f8b0d7e4d90bd29775167 templates/ind_share_base.mako --- a/templates/ind_share_base.mako +++ b/templates/ind_share_base.mako @@ -83,7 +83,7 @@ %><div class="toolForm"> - <div class="toolFormTitle">Share ${item_class_name} '${item_name}' with Another User</div> + <div class="toolFormTitle">Share ${item_class_name} '${item_name | h}' with Another User</div><div class="toolFormBody"><form action="${h.url_for(controller=item_controller, action='share', id=trans.security.encode_id( item.id ) )}" method="POST"><div class="form-row"> diff -r cae8a513079a183d16bd8a16b915d6aa5322a249 -r adc4aa8b3d9ad77ef85f8b0d7e4d90bd29775167 templates/sharing_base.mako --- a/templates/sharing_base.mako +++ b/templates/sharing_base.mako @@ -35,7 +35,7 @@ </%def><%def name="title()"> - Sharing and Publishing ${get_class_display_name( item.__class__ )} '${get_item_name( item )}' + Sharing and Publishing ${get_class_display_name( item.__class__ )} '${get_item_name( item ) | h}' </%def><%def name="javascripts()"> @@ -122,7 +122,7 @@ item_name = get_item_name(item) %> - <h2>Share or Publish ${item_class_name} '${item_name}'</h2> + <h2>Share or Publish ${item_class_name} '${item_name | h}'</h2> ## Require that user have a public username before sharing or publishing an item. %if trans.get_user().username is None or trans.get_user().username is "": diff -r cae8a513079a183d16bd8a16b915d6aa5322a249 -r adc4aa8b3d9ad77ef85f8b0d7e4d90bd29775167 templates/webapps/galaxy/history/embed.mako --- a/templates/webapps/galaxy/history/embed.mako +++ b/templates/webapps/galaxy/history/embed.mako @@ -20,7 +20,7 @@ </div><h4><a class="toggle-embed" href="${display_href}" title="Show or hide history contents"> - Galaxy History | ${get_item_name( item )} + Galaxy History | ${get_item_name( item ) | h} </a></h4> %if hasattr( item, "annotation") and item.annotation: diff -r cae8a513079a183d16bd8a16b915d6aa5322a249 -r adc4aa8b3d9ad77ef85f8b0d7e4d90bd29775167 templates/webapps/galaxy/mobile/history/list.mako --- a/templates/webapps/galaxy/mobile/history/list.mako +++ b/templates/webapps/galaxy/mobile/history/list.mako @@ -20,7 +20,7 @@ <li><a href="${h.url_for(controller='mobile', action="history_detail", id=history.id )}"> - ${history.name} + ${history.name | h} <div class="secondary">${h.date.distance_of_time_in_words( history.update_time, h.date.datetime.utcnow() )} ago</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.

1 0

commit/galaxy-central: dannon: Remove unnecessary split on wsgi.url_scheme
by commits-noreply＠bitbucket.org 25 Nov '14

25 Nov '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/624c1f52f627/ Changeset: 624c1f52f627 User: dannon Date: 2014-11-25 16:33:26+00:00 Summary: Remove unnecessary split on wsgi.url_scheme Affected #: 1 file diff -r 25698b985bf51cbd732025d9f84444019c788ef4 -r 624c1f52f62771dda89de969eed67c94c4bfeef5 lib/galaxy/web/framework/middleware/xforwardedhost.py --- a/lib/galaxy/web/framework/middleware/xforwardedhost.py +++ b/lib/galaxy/web/framework/middleware/xforwardedhost.py @@ -5,6 +5,7 @@ """ def __init__( self, app, global_conf=None ): self.app = app + def __call__( self, environ, start_response ): x_forwarded_host = environ.get( 'HTTP_X_FORWARDED_HOST', None ) if x_forwarded_host: @@ -17,5 +18,5 @@ x_url_scheme = environ.get( 'HTTP_X_URL_SCHEME', None ) if x_url_scheme: environ[ 'original_wsgi.url_scheme' ] = environ[ 'wsgi.url_scheme' ] - environ[ 'wsgi.url_scheme' ] = x_url_scheme.split(', ', 1)[0] + environ[ 'wsgi.url_scheme' ] = x_url_scheme return self.app( environ, start_response ) 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 0

commit/galaxy-central: dannon: Merged in JanKanis/galaxy-central (pull request #560)
by commits-noreply＠bitbucket.org 25 Nov '14

25 Nov '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/25698b985bf5/ Changeset: 25698b985bf5 User: dannon Date: 2014-11-25 16:32:20+00:00 Summary: Merged in JanKanis/galaxy-central (pull request #560) use first component of X-Forwarded-{For,Host,Scheme} Affected #: 1 file diff -r 69a6f901230540012d38f17adb1995d96f6a5dba -r 25698b985bf51cbd732025d9f84444019c788ef4 lib/galaxy/web/framework/middleware/xforwardedhost.py --- a/lib/galaxy/web/framework/middleware/xforwardedhost.py +++ b/lib/galaxy/web/framework/middleware/xforwardedhost.py @@ -9,13 +9,13 @@ x_forwarded_host = environ.get( 'HTTP_X_FORWARDED_HOST', None ) if x_forwarded_host: environ[ 'ORGINAL_HTTP_HOST' ] = environ[ 'HTTP_HOST' ] - environ[ 'HTTP_HOST' ] = x_forwarded_host + environ[ 'HTTP_HOST' ] = x_forwarded_host.split(', ', 1)[0] x_forwarded_for = environ.get( 'HTTP_X_FORWARDED_FOR', None ) if x_forwarded_for: environ[ 'ORGINAL_REMOTE_ADDR' ] = environ[ 'REMOTE_ADDR' ] - environ[ 'REMOTE_ADDR' ] = x_forwarded_for + environ[ 'REMOTE_ADDR' ] = x_forwarded_for.split(', ', 1)[0] x_url_scheme = environ.get( 'HTTP_X_URL_SCHEME', None ) if x_url_scheme: environ[ 'original_wsgi.url_scheme' ] = environ[ 'wsgi.url_scheme' ] - environ[ 'wsgi.url_scheme' ] = x_url_scheme + environ[ 'wsgi.url_scheme' ] = x_url_scheme.split(', ', 1)[0] return self.app( environ, start_response ) 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 0

commit/galaxy-central: 2 new changesets
by commits-noreply＠bitbucket.org 25 Nov '14

25 Nov '14

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/3d707aa29b5e/ Changeset: 3d707aa29b5e User: JanKanis Date: 2014-11-13 15:48:02+00:00 Summary: use first component of X-Forwarded-{For,Host,Scheme} X-Forwarded-{For,Host,Scheme} can contain multiple comma-separated components if there are multiple reverse proxies. Use the first (outer) one. See http://httpd.apache.org/docs/2.4/mod/mod_proxy.html#x-headers for apache docs. Affected #: 1 file diff -r e372aaa3b3bc1ab9f9b8053d277c678647e8007a -r 3d707aa29b5e0114827ccfc70dc93d7118e8c2e1 lib/galaxy/web/framework/middleware/xforwardedhost.py --- a/lib/galaxy/web/framework/middleware/xforwardedhost.py +++ b/lib/galaxy/web/framework/middleware/xforwardedhost.py @@ -9,13 +9,13 @@ x_forwarded_host = environ.get( 'HTTP_X_FORWARDED_HOST', None ) if x_forwarded_host: environ[ 'ORGINAL_HTTP_HOST' ] = environ[ 'HTTP_HOST' ] - environ[ 'HTTP_HOST' ] = x_forwarded_host + environ[ 'HTTP_HOST' ] = x_forwarded_host.split(', ', 1)[0] x_forwarded_for = environ.get( 'HTTP_X_FORWARDED_FOR', None ) if x_forwarded_for: environ[ 'ORGINAL_REMOTE_ADDR' ] = environ[ 'REMOTE_ADDR' ] - environ[ 'REMOTE_ADDR' ] = x_forwarded_for + environ[ 'REMOTE_ADDR' ] = x_forwarded_for.split(', ', 1)[0] x_url_scheme = environ.get( 'HTTP_X_URL_SCHEME', None ) if x_url_scheme: environ[ 'original_wsgi.url_scheme' ] = environ[ 'wsgi.url_scheme' ] - environ[ 'wsgi.url_scheme' ] = x_url_scheme + environ[ 'wsgi.url_scheme' ] = x_url_scheme.split(', ', 1)[0] return self.app( environ, start_response ) https://bitbucket.org/galaxy/galaxy-central/commits/25698b985bf5/ Changeset: 25698b985bf5 User: dannon Date: 2014-11-25 16:32:20+00:00 Summary: Merged in JanKanis/galaxy-central (pull request #560) use first component of X-Forwarded-{For,Host,Scheme} Affected #: 1 file diff -r 69a6f901230540012d38f17adb1995d96f6a5dba -r 25698b985bf51cbd732025d9f84444019c788ef4 lib/galaxy/web/framework/middleware/xforwardedhost.py --- a/lib/galaxy/web/framework/middleware/xforwardedhost.py +++ b/lib/galaxy/web/framework/middleware/xforwardedhost.py @@ -9,13 +9,13 @@ x_forwarded_host = environ.get( 'HTTP_X_FORWARDED_HOST', None ) if x_forwarded_host: environ[ 'ORGINAL_HTTP_HOST' ] = environ[ 'HTTP_HOST' ] - environ[ 'HTTP_HOST' ] = x_forwarded_host + environ[ 'HTTP_HOST' ] = x_forwarded_host.split(', ', 1)[0] x_forwarded_for = environ.get( 'HTTP_X_FORWARDED_FOR', None ) if x_forwarded_for: environ[ 'ORGINAL_REMOTE_ADDR' ] = environ[ 'REMOTE_ADDR' ] - environ[ 'REMOTE_ADDR' ] = x_forwarded_for + environ[ 'REMOTE_ADDR' ] = x_forwarded_for.split(', ', 1)[0] x_url_scheme = environ.get( 'HTTP_X_URL_SCHEME', None ) if x_url_scheme: environ[ 'original_wsgi.url_scheme' ] = environ[ 'wsgi.url_scheme' ] - environ[ 'wsgi.url_scheme' ] = x_url_scheme + environ[ 'wsgi.url_scheme' ] = x_url_scheme.split(', ', 1)[0] return self.app( environ, start_response ) 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 0

commit/galaxy-central: davebgx: Actually fix migration 23.
by commits-noreply＠bitbucket.org 25 Nov '14

25 Nov '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/69a6f9012305/ Changeset: 69a6f9012305 User: davebgx Date: 2014-11-25 15:33:01+00:00 Summary: Actually fix migration 23. Affected #: 1 file diff -r c35433664129cfcf07c39365350d2811b88c8a0f -r 69a6f901230540012d38f17adb1995d96f6a5dba lib/galaxy/webapps/tool_shed/model/migrate/versions/0023_add_repository_url_and_hompeage_url.py --- a/lib/galaxy/webapps/tool_shed/model/migrate/versions/0023_add_repository_url_and_hompeage_url.py +++ b/lib/galaxy/webapps/tool_shed/model/migrate/versions/0023_add_repository_url_and_hompeage_url.py @@ -7,6 +7,7 @@ from sqlalchemy.orm import * from migrate import * from migrate.changeset import * +from galaxy.model.custom_types import TrimmedString import sys, logging @@ -35,7 +36,6 @@ assert c_homepage is Repository_table.c.homepage_url except Exception, e: print "Adding remote_repository_url and homepage_url columns to the repository table failed: %s" % str( e ) - migrate_engine.execute( cmd ) def downgrade( migrate_engine ): metadata.bind = migrate_engine @@ -43,7 +43,7 @@ # Drop type column from repository table. Repository_table = Table( "repository", metadata, autoload=True ) try: - Repository_table.c.drop() + Repository_table.c.remote_repository_url.drop() Repository_table.c.homepage_url.drop() except Exception, e: print "Dropping columns remote_repository_url and homepage_url from the repository table failed: %s" % str( e ) 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 0

commit/galaxy-central: davebgx: Fix error in migration stage 23.
by commits-noreply＠bitbucket.org 25 Nov '14

25 Nov '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/c35433664129/ Changeset: c35433664129 User: davebgx Date: 2014-11-25 15:14:31+00:00 Summary: Fix error in migration stage 23. Affected #: 1 file diff -r 237bf9f39e6da44f99c291154892155b8847bd97 -r c35433664129cfcf07c39365350d2811b88c8a0f lib/galaxy/webapps/tool_shed/model/migrate/versions/0023_add_repository_url_and_hompeage_url.py --- a/lib/galaxy/webapps/tool_shed/model/migrate/versions/0023_add_repository_url_and_hompeage_url.py +++ b/lib/galaxy/webapps/tool_shed/model/migrate/versions/0023_add_repository_url_and_hompeage_url.py @@ -43,7 +43,7 @@ # Drop type column from repository table. Repository_table = Table( "repository", metadata, autoload=True ) try: - Repository_table.c..drop() + Repository_table.c.drop() Repository_table.c.homepage_url.drop() except Exception, e: print "Dropping columns remote_repository_url and homepage_url from the repository table failed: %s" % str( e ) 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 0

commit/galaxy-central: guerler: ToolForm: Handle boolean definition without modifying shared code
by commits-noreply＠bitbucket.org 25 Nov '14

25 Nov '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/237bf9f39e6d/ Changeset: 237bf9f39e6d User: guerler Date: 2014-11-25 03:34:33+00:00 Summary: ToolForm: Handle boolean definition without modifying shared code Affected #: 1 file diff -r 622f3fd9202a009620f56fced7ff2c5461a8fdf0 -r 237bf9f39e6da44f99c291154892155b8847bd97 lib/galaxy/webapps/galaxy/api/tools.py --- a/lib/galaxy/webapps/galaxy/api/tools.py +++ b/lib/galaxy/webapps/galaxy/api/tools.py @@ -588,6 +588,21 @@ for input in inputs.itervalues(): state[input.name] = input.get_initial_value(trans, context) + # check the current state of a value and update it if necessary + def check_state(trans, input, default_value, context): + value = default_value + error = 'State validation failed.' + try: + # resolves the inconsistent definition of boolean parameters (see base.py) without modifying shared code + if input.type == 'boolean': + value, error = [util.string_as_bool(default_value), None] + else: + value, error = check_param(trans, input, default_value, context) + except Exception: + log.error('Checking parameter %s failed.', input.name) + pass + return [value, error] + # populates state with incoming url parameters def populate_state(trans, inputs, state, incoming, prefix="", context=None ): errors = dict() @@ -620,9 +635,9 @@ group_prefix = "%s|" % ( key ) test_param_key = group_prefix + input.test_param.name default_value = incoming.get(test_param_key, group_state.get(input.test_param.name, None)) - value, test_param_error = check_param( trans, input.test_param, default_value, context) - if test_param_error: - errors[input.name] = [test_param_error] + value, error = check_state(trans, input.test_param, default_value, context) + if error: + errors[input.name] = [error] else: current_case = input.get_current_case(value, trans) group_state = state[input.name] = {} @@ -631,16 +646,13 @@ if group_errors: errors[input.name] = group_errors group_state['__current_case__'] = current_case - group_state[ input.test_param.name ] = value + group_state[input.test_param.name] = value else: - try: - value, error = check_param(trans, input, incoming.get(key, state.get(input.name, None)), context) - if error: - errors[input.name] = error - state[input.name] = value - except Exception: - log.error('Checking parameter %s failed.', input.name) - pass + default_value = incoming.get(key, state.get(input.name, None)) + value, error = check_state(trans, input, default_value, context) + if error: + errors[input.name] = error + state[input.name] = value return errors # builds tool model including all attributes 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 0

commit/galaxy-central: martenson: allow for setting page title in galaxy.panels.mako; set one for data libraries
by commits-noreply＠bitbucket.org 25 Nov '14

25 Nov '14

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/622f3fd9202a/ Changeset: 622f3fd9202a User: martenson Date: 2014-11-25 01:48:56+00:00 Summary: allow for setting page title in galaxy.panels.mako; set one for data libraries Affected #: 2 files diff -r f8eb167f92141c345426db259914028317767973 -r 622f3fd9202a009620f56fced7ff2c5461a8fdf0 lib/galaxy/webapps/galaxy/controllers/library.py --- a/lib/galaxy/webapps/galaxy/controllers/library.py +++ b/lib/galaxy/webapps/galaxy/controllers/library.py @@ -84,8 +84,10 @@ app = { 'jscript' : "galaxy.library" } - # fill template - return trans.fill_template('galaxy.panels.mako', config = {'app' : app}) + return trans.fill_template( 'galaxy.panels.mako', + config = { + 'title': 'Galaxy Data Libraries', + 'app': app } ) @web.expose def index( self, trans, **kwd ): diff -r f8eb167f92141c345426db259914028317767973 -r 622f3fd9202a009620f56fced7ff2c5461a8fdf0 templates/webapps/galaxy/galaxy.panels.mako --- a/templates/webapps/galaxy/galaxy.panels.mako +++ b/templates/webapps/galaxy/galaxy.panels.mako @@ -8,7 +8,7 @@ ## set defaults self.galaxy_config = { ## template options - 'title' : '', + 'title' : 'Galaxy - Data Intensive Biology for Everyone', 'master' : True, 'left_panel' : False, 'right_panel' : False, @@ -160,7 +160,11 @@ ## document <html><head> - <title></title> + <title> + %if self.galaxy_config['title']: + ${self.galaxy_config['title']} + %endif + </title><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> ## for mobile browsers, don't scale up 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 0