2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/74aa8a401390/ Changeset: 74aa8a401390 User: dannon Date: 2015-02-13 20:03:33+00:00 Summary: Change external display application reloading to use the internal queue and reflect appropriately to other processes. Affected #: 2 files diff -r 3fdbd1437678b2e3edd24b14a2658c5ec1a7dcb3 -r 74aa8a401390cd53ef04d836303c121d01a1f087 lib/galaxy/queue_worker.py --- a/lib/galaxy/queue_worker.py +++ b/lib/galaxy/queue_worker.py @@ -102,6 +102,12 @@ log.error("Reload tool invoked without tool id.") +def reload_display_application(app, **kwargs): + display_application_ids = kwargs.get('display_application_ids', None) + log.debug("Executing display application reload task for %s" % display_application_ids) + app.datatypes_registry.reload_display_applications( display_application_ids) + + def reload_tool_data_tables(app, **kwargs): params = util.Params(kwargs) log.debug("Executing tool data table reload for %s" % params.get('table_names', 'all tables')) @@ -118,5 +124,6 @@ % (job_lock, "not" if job_lock else "now")) control_message_to_task = { 'reload_tool': reload_tool, + 'reload_display_application': reload_display_application, 'reload_tool_data_tables': reload_tool_data_tables, 'admin_job_lock': admin_job_lock} diff -r 3fdbd1437678b2e3edd24b14a2658c5ec1a7dcb3 -r 74aa8a401390cd53ef04d836303c121d01a1f087 lib/galaxy/webapps/galaxy/controllers/admin.py --- a/lib/galaxy/webapps/galaxy/controllers/admin.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin.py @@ -2,6 +2,7 @@ import logging import os +import galaxy.queue_worker import galaxy.util from galaxy import model from galaxy.model import tool_shed_install as install_model @@ -892,6 +893,10 @@ @web.expose @web.require_admin def reload_display_application( self, trans, **kwd ): + galaxy.queue_worker.send_control_task(trans, + 'reload_display_application', + noop_self=True, + kwargs={'display_application_ids': kwd.get( 'id' )} ) reloaded, failed = trans.app.datatypes_registry.reload_display_applications( kwd.get( 'id' ) ) if not reloaded and failed: return trans.show_error_message( 'Unable to reload any of the %i requested display applications ("%s").' % ( len( failed ), '", "'.join( failed ) ) ) https://bitbucket.org/galaxy/galaxy-central/commits/7179d35d2a99/ Changeset: 7179d35d2a99 User: dannon Date: 2015-02-13 20:03:44+00:00 Summary: Merge. Affected #: 2 files diff -r 74aa8a401390cd53ef04d836303c121d01a1f087 -r 7179d35d2a998d960aeac03b3755ff1f64e118d7 static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -1414,7 +1414,7 @@ .ui-table tbody,.ui-table-plain tbody{cursor:pointer} .ui-table-plain{table-layout:fixed}.ui-table-plain tbody{cursor:auto !important}.ui-table-plain tbody td{padding:0px !important;border:none !important} .ui-table-plain .ui-table-section{border-left:solid 3px #ebd9b2;border-radius:5px !important;margin-bottom:5px;padding-left:10px} -.ui-table-form-element{margin-top:5px;margin-bottom:5px}.ui-table-form-element .ui-table-form-title-optional{font-weight:bold;text-decoration:underline;cursor:pointer} +.ui-table-form-element{margin-top:5px;margin-bottom:5px;overflow:hidden}.ui-table-form-element .ui-table-form-title-optional{font-weight:bold;text-decoration:underline;cursor:pointer} .ui-table-form-element .ui-table-form-field{margin-top:5px} .ui-table-form-title-strong{font-weight:bold} .ui-table-form-info{clear:both !important} @@ -1456,8 +1456,8 @@ .ui-color-picker .ui-color-picker-header{cursor:pointer} .ui-color-picker .ui-color-picker-value{float:left;border-radius:3px;border:solid 1px #000000;width:12px;height:12px;margin-bottom:10px;margin-right:5px} .ui-color-picker .ui-color-picker-label{float:left;line-height:1.2em} -.ui-color-picker .ui-color-picker-view{height:100%;overflow:auto;display:none;float:left}.ui-color-picker .ui-color-picker-view .ui-color-picker-panel{height:100%;overflow:auto;width:230px}.ui-color-picker .ui-color-picker-view .ui-color-picker-panel .ui-color-picker-content{clear:both;margin-bottom:15px}.ui-color-picker .ui-color-picker-view .ui-color-picker-panel .ui-color-picker-content .label{padding-bottom:2px} -.ui-color-picker .ui-color-picker-view .ui-color-picker-panel .ui-color-picker-content .line{clear:both}.ui-color-picker .ui-color-picker-view .ui-color-picker-panel .ui-color-picker-content .line .ui-color-picker-box{cursor:pointer;float:left;margin-right:5px;border:solid 1px #c0c0c0;width:15px;height:15px;border-radius:2px}.ui-color-picker .ui-color-picker-view .ui-color-picker-panel .ui-color-picker-content .line .ui-color-picker-box .ui-color-picker-check{color:black;font-size:1.2em;position:relative;left:1px} +.ui-color-picker .ui-color-picker-view{display:none;float:left;overflow:auto;height:100%}.ui-color-picker .ui-color-picker-view .ui-color-picker-panel{width:210px}.ui-color-picker .ui-color-picker-view .ui-color-picker-panel .ui-color-picker-content{margin-bottom:15px}.ui-color-picker .ui-color-picker-view .ui-color-picker-panel .ui-color-picker-content .label{padding-bottom:2px} +.ui-color-picker .ui-color-picker-view .ui-color-picker-panel .ui-color-picker-content .line .ui-color-picker-box{cursor:pointer;float:left;margin-right:5px;border:solid 1px #c0c0c0;width:15px;height:15px;border-radius:2px}.ui-color-picker .ui-color-picker-view .ui-color-picker-panel .ui-color-picker-content .line .ui-color-picker-box .ui-color-picker-check{color:black;font-size:1.2em;position:relative;left:1px} .libraryRow{background-color:#ebd9b2} .datasetHighlighted{background-color:#f9f9f9} .libraryItemDeleted-True{font-style:italic} diff -r 74aa8a401390cd53ef04d836303c121d01a1f087 -r 7179d35d2a998d960aeac03b3755ff1f64e118d7 static/style/src/less/ui.less --- a/static/style/src/less/ui.less +++ b/static/style/src/less/ui.less @@ -152,6 +152,7 @@ } margin-top: @ui-margin-vertical; margin-bottom: @ui-margin-vertical; + overflow: hidden; } .ui-table-form-title-strong { @@ -465,17 +466,13 @@ display: none; float: left; .ui-color-picker-panel { - height: 100%; - overflow: auto; - width: 230px; + width: 210px; .ui-color-picker-content { - clear: both; margin-bottom: 15px; .label { padding-bottom: 2px; } .line { - clear: both; .ui-color-picker-box { cursor: pointer; float: left; 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.