- galaxy-commits - lists.galaxyproject.org

commit/galaxy-central: guerler: Parameters: Fix initial value for drill downs, Workflow/ToolForm: Move module building to api
by commits-noreply＠bitbucket.org 09 Feb '15

09 Feb '15

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/de8fa2d2312e/ Changeset: de8fa2d2312e User: guerler Date: 2015-02-09 04:49:24+00:00 Summary: Parameters: Fix initial value for drill downs, Workflow/ToolForm: Move module building to api Affected #: 14 files diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 client/galaxy/scripts/mvc/tools/tools-form-workflow.js --- a/client/galaxy/scripts/mvc/tools/tools-form-workflow.js +++ b/client/galaxy/scripts/mvc/tools/tools-form-workflow.js @@ -275,10 +275,16 @@ /** Request a new model for an already created tool form and updates the form inputs */ _updateModel: function() { + // link self + var self = this; + // create the request dictionary - var self = this; - var current_state = this.tree.finalize(); - + var current_state = { + tool_id : this.options.id, + tool_version : this.options.version, + inputs : this.tree.finalize() + } + // log tool state console.debug('tools-form-workflow::_refreshForm() - Refreshing states.'); console.debug(current_state); @@ -287,11 +293,11 @@ var process_id = this.deferred.register(); // build model url for request - var model_url = galaxy_config.root + 'workflow/editor_form_post?tool_id=' + this.options.id + '&__is_dynamic__=False'; + var model_url = galaxy_config.root + 'api/workflows/build_module'; // post job Utils.request({ - type : 'GET', + type : 'POST', url : model_url, data : current_state, success : function(data) { diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 client/galaxy/scripts/mvc/tools/tools-tree.js --- a/client/galaxy/scripts/mvc/tools/tools-tree.js +++ b/client/galaxy/scripts/mvc/tools/tools-tree.js @@ -10,13 +10,13 @@ initialize: function(app) { this.app = app; }, - + /** Convert dictionary representation into tool api specific flat dictionary format. */ finalize: function(patch) { // link this var self = this; - + // dictionary with api specific identifiers this.map_dict = {}; @@ -24,24 +24,24 @@ if (!this.app.section) { return {}; } - + // ensure that dictionary with patching functions exists patch = patch || {}; - + // dictionary formatted for job submission or tool form update var result_dict = {}; // prepare full dictionary var dict = {}; - + // fill dictionary from dom this._iterate(this.app.section.$el, dict); - + // add identifier and value to job definition function add(job_input_id, input_id, input_value) { // add entry to result dictionary result_dict[job_input_id] = input_value; - + // backup id mapping self.map_dict[job_input_id] = input_id; }; @@ -53,21 +53,21 @@ if (node.input) { // get node var input = node.input; - + // create identifier var job_input_id = identifier; if (identifier != '') { job_input_id += '|'; } job_input_id += input.name; - + // process input type switch (input.type) { // handle repeats case 'repeat': // section identifier var section_label = 'section-'; - + // collect repeat block identifiers var block_indices = []; var block_prefix = null; @@ -81,10 +81,10 @@ } } } - + // sort repeat blocks block_indices.sort(function(a,b) { return a - b; }); - + // add to response dictionary in created order var index = 0; for (var i in block_indices) { @@ -98,10 +98,10 @@ if (patch[input.test_param.type]) { value = patch[input.test_param.type](value); } - + // add conditional value add (job_input_id + '|' + input.test_param.name, input.id, value); - + // identify selected case var selectedCase = self.matchCase(input, value); if (selectedCase != -1) { @@ -116,22 +116,17 @@ // get field var field = self.app.field_list[input.id]; if (field && field.value) { + // validate field value + var value = field.value(); + if (field.validate && !field.validate()) { + value = null; + } + // get and patch field value - var value = field.value(); if (patch[input.type]) { value = patch[input.type](value); } - // validate field value - if (field.skip) { - continue; - } - - // validate field value - if (field.validate && !field.validate()) { - value = null; - } - // ignore certain values if (input.ignore === undefined || (value !== null && input.ignore != value)) { // add value to submission @@ -149,20 +144,20 @@ } } } - + // start conversion convert('', dict); - + // return result return result_dict; }, - + /** Match job definition identifier to input element identifier */ match: function (job_input_id) { return this.map_dict && this.map_dict[job_input_id]; }, - + /** Match conditional values to selected cases */ matchCase: function(input, value) { @@ -174,27 +169,27 @@ value = input.test_param.falsevalue || 'false'; } } - + // find selected case for (var i in input.cases) { if (input.cases[i].value == value) { return i; } } - + // selected case not found return -1; }, - + /** Matches identifier from api model to input elements */ matchModel: function(model, callback) { // final result dictionary var result = {}; - + // link this var self = this; - + // search throughout response function search (id, head) { for (var i in head) { @@ -224,23 +219,23 @@ } } } - + // match all ids and return messages search('', model.inputs); // return matched results return result; }, - + /** Matches identifier from api response to input elements */ matchResponse: function(response) { // final result dictionary var result = {}; - + // link this var self = this; - + // search throughout response function search (id, head) { if (typeof head === 'string') { @@ -262,14 +257,14 @@ } } } - + // match all ids and return messages search('', response); - + // return matched results return result; }, - + /** Iterate through the tool form dom and map it to the dictionary. */ _iterate: function(parent, dict) { @@ -279,15 +274,15 @@ children.each(function() { // get child element var child = this; - + // get id var id = $(child).attr('id'); - + // create new branch if ($(child).hasClass('section-row')) { // create sub dictionary dict[id] = {}; - + // add input element if it exists var input = self.app.input_list[id]; if (input) { @@ -295,7 +290,7 @@ input : input } } - + // fill sub dictionary self._iterate(child, dict[id]); } else { diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -2250,13 +2250,12 @@ return tool_dict - def to_json (self, trans, **kwd): + def to_json (self, trans, kwd={}, is_dynamic=True): """ Recursively creates a tool dictionary containing repeats, dynamic options and updated states. """ job_id = kwd.get('__job_id__', None) dataset_id = kwd.get('__dataset_id__', None) - is_dynamic = string_as_bool(kwd.get('__is_dynamic__', True)) # load job details if provided job = None diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1618,6 +1618,8 @@ return UnvalidatedValue( None ) initial_values = [] recurse_options( initial_values, self.get_options( trans=trans, other_values=context ) ) + if len( initial_values ) == 0: + initial_values = None return initial_values def value_to_display_text( self, value, app ): diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 lib/galaxy/webapps/galaxy/api/tools.py --- a/lib/galaxy/webapps/galaxy/api/tools.py +++ b/lib/galaxy/webapps/galaxy/api/tools.py @@ -76,14 +76,10 @@ GET /api/tools/{tool_id}/build Returns a tool model including dynamic parameters and updated values, repeats block etc. """ - tool_id = urllib.unquote_plus( id ) tool_version = kwd.get( 'tool_version', None ) - tool = self.app.toolbox.get_tool( tool_id, tool_version ) - if not tool: - trans.response.status = 500 - return { 'error': 'Could not find tool with id \'%s\'' % tool_id } - return tool.to_json(trans, **kwd) - + tool = self._get_tool( id, tool_version=tool_version, user=trans.user ) + return tool.to_json(trans, kwd) + @_future_expose_api @web.require_admin def reload( self, trans, tool_id, **kwd ): diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 lib/galaxy/webapps/galaxy/api/workflows.py --- a/lib/galaxy/webapps/galaxy/api/workflows.py +++ b/lib/galaxy/webapps/galaxy/api/workflows.py @@ -6,6 +6,8 @@ import uuid import logging +import copy +import urllib from sqlalchemy import desc, or_, and_ from galaxy import exceptions, util from galaxy.model.item_attrs import UsesAnnotations @@ -17,6 +19,7 @@ from galaxy.workflow.extract import extract_workflow from galaxy.workflow.run import invoke, queue_invoke from galaxy.workflow.run_request import build_workflow_run_config +from galaxy.workflow.modules import module_factory log = logging.getLogger(__name__) @@ -305,6 +308,52 @@ raise exceptions.RequestParameterInvalidException( message ) return self.workflow_contents_manager.workflow_to_dict( trans, stored_workflow, style="instance" ) + @expose_api + def build_module( self, trans, payload={}): + """ + POST /api/workflows/build_module + Builds module details including a tool model for the workflow editor. + """ + tool_id = payload.get( 'tool_id', None ) + tool_version = payload.get( 'tool_version', None ) + tool_inputs = payload.get( 'inputs', None ) + annotation = payload.get( 'annotation', '' ) + + # load tool + tool = self._get_tool( tool_id, tool_version=tool_version, user=trans.user ) + + # initialize module + trans.workflow_building_mode = True + module = module_factory.from_dict( trans, { + 'type' : 'tool', + 'tool_id' : tool.id, + 'tool_state' : None + } ) + + # create tool model and default tool state (if missing) + tool_model = module.tool.to_json(trans, tool_inputs, is_dynamic=False) + module.state.inputs = copy.deepcopy(tool_model['state_inputs']) + return { + 'tool_model' : tool_model, + 'tool_state' : module.get_state(), + 'data_inputs' : module.get_data_inputs(), + 'data_outputs' : module.get_data_outputs(), + 'tool_errors' : module.get_errors(), + 'form_html' : module.get_config_form(), + 'annotation' : annotation, + 'post_job_actions' : module.get_post_job_actions(tool_inputs) + } + + # + # -- Helper methods -- + # + def _get_tool( self, id, tool_version=None, user=None ): + id = urllib.unquote_plus( id ) + tool = self.app.toolbox.get_tool( id, tool_version ) + if not tool or not tool.allow_user_access( user ): + raise exceptions.ObjectNotFound("Could not find tool with id '%s'" % id) + return tool + def __api_import_new_workflow( self, trans, payload, **kwd ): data = payload['workflow'] diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 lib/galaxy/webapps/galaxy/buildapp.py --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -217,6 +217,7 @@ webapp.mapper.resource_with_deleted( 'user', 'users', path_prefix='/api' ) webapp.mapper.resource( 'genome', 'genomes', path_prefix='/api' ) webapp.mapper.resource( 'visualization', 'visualizations', path_prefix='/api' ) + webapp.mapper.connect( '/api/workflows/build_module', action='build_module', controller="workflows" ) webapp.mapper.resource( 'workflow', 'workflows', path_prefix='/api' ) webapp.mapper.resource_with_deleted( 'history', 'histories', path_prefix='/api' ) webapp.mapper.connect( '/api/histories/{history_id}/citations', action='citations', controller="histories" ) diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 lib/galaxy/webapps/galaxy/controllers/workflow.py --- a/lib/galaxy/webapps/galaxy/controllers/workflow.py +++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py @@ -609,7 +609,6 @@ This is used for the form shown in the right pane when a node is selected. """ - tool_state = incoming.pop('tool_state', None) trans.workflow_building_mode = True module = module_factory.from_dict( trans, { @@ -617,22 +616,7 @@ 'tool_id': tool_id, 'tool_state': tool_state } ) - - # create tool model and default tool state (if missing) - if type == 'tool' and not tool_state: - tool_model = module.tool.to_json(trans, **incoming) - module.state.inputs = copy.deepcopy(tool_model['state_inputs']) - return { - 'tool_model': tool_model, - 'tool_state': module.get_state(), - 'data_inputs': module.get_data_inputs(), - 'data_outputs': module.get_data_outputs(), - 'tool_errors': module.get_errors(), - 'form_html': module.get_config_form(), - 'annotation': annotation, - 'post_job_actions': module.get_post_job_actions(incoming) - } - + # update module state module.update_state( incoming ) @@ -669,7 +653,8 @@ module = module_factory.new( trans, type, **kwargs ) tool_model = None if type == 'tool': - tool_model = module.tool.to_json(trans) + tool_model = module.tool.to_json(trans, is_dynamic=False) + module.state.inputs = copy.deepcopy(tool_model['state_inputs']) return { 'type': module.type, 'name': module.get_name(), diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 static/scripts/mvc/tools/tools-form-workflow.js --- a/static/scripts/mvc/tools/tools-form-workflow.js +++ b/static/scripts/mvc/tools/tools-form-workflow.js @@ -275,10 +275,16 @@ /** Request a new model for an already created tool form and updates the form inputs */ _updateModel: function() { + // link self + var self = this; + // create the request dictionary - var self = this; - var current_state = this.tree.finalize(); - + var current_state = { + tool_id : this.options.id, + tool_version : this.options.version, + inputs : this.tree.finalize() + } + // log tool state console.debug('tools-form-workflow::_refreshForm() - Refreshing states.'); console.debug(current_state); @@ -287,11 +293,11 @@ var process_id = this.deferred.register(); // build model url for request - var model_url = galaxy_config.root + 'workflow/editor_form_post?tool_id=' + this.options.id + '&__is_dynamic__=False'; + var model_url = galaxy_config.root + 'api/workflows/build_module'; // post job Utils.request({ - type : 'GET', + type : 'POST', url : model_url, data : current_state, success : function(data) { diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 static/scripts/mvc/tools/tools-tree.js --- a/static/scripts/mvc/tools/tools-tree.js +++ b/static/scripts/mvc/tools/tools-tree.js @@ -10,13 +10,13 @@ initialize: function(app) { this.app = app; }, - + /** Convert dictionary representation into tool api specific flat dictionary format. */ finalize: function(patch) { // link this var self = this; - + // dictionary with api specific identifiers this.map_dict = {}; @@ -24,24 +24,24 @@ if (!this.app.section) { return {}; } - + // ensure that dictionary with patching functions exists patch = patch || {}; - + // dictionary formatted for job submission or tool form update var result_dict = {}; // prepare full dictionary var dict = {}; - + // fill dictionary from dom this._iterate(this.app.section.$el, dict); - + // add identifier and value to job definition function add(job_input_id, input_id, input_value) { // add entry to result dictionary result_dict[job_input_id] = input_value; - + // backup id mapping self.map_dict[job_input_id] = input_id; }; @@ -53,21 +53,21 @@ if (node.input) { // get node var input = node.input; - + // create identifier var job_input_id = identifier; if (identifier != '') { job_input_id += '|'; } job_input_id += input.name; - + // process input type switch (input.type) { // handle repeats case 'repeat': // section identifier var section_label = 'section-'; - + // collect repeat block identifiers var block_indices = []; var block_prefix = null; @@ -81,10 +81,10 @@ } } } - + // sort repeat blocks block_indices.sort(function(a,b) { return a - b; }); - + // add to response dictionary in created order var index = 0; for (var i in block_indices) { @@ -98,10 +98,10 @@ if (patch[input.test_param.type]) { value = patch[input.test_param.type](value); } - + // add conditional value add (job_input_id + '|' + input.test_param.name, input.id, value); - + // identify selected case var selectedCase = self.matchCase(input, value); if (selectedCase != -1) { @@ -116,22 +116,17 @@ // get field var field = self.app.field_list[input.id]; if (field && field.value) { + // validate field value + var value = field.value(); + if (field.validate && !field.validate()) { + value = null; + } + // get and patch field value - var value = field.value(); if (patch[input.type]) { value = patch[input.type](value); } - // validate field value - if (field.skip) { - continue; - } - - // validate field value - if (field.validate && !field.validate()) { - value = null; - } - // ignore certain values if (input.ignore === undefined || (value !== null && input.ignore != value)) { // add value to submission @@ -149,20 +144,20 @@ } } } - + // start conversion convert('', dict); - + // return result return result_dict; }, - + /** Match job definition identifier to input element identifier */ match: function (job_input_id) { return this.map_dict && this.map_dict[job_input_id]; }, - + /** Match conditional values to selected cases */ matchCase: function(input, value) { @@ -174,27 +169,27 @@ value = input.test_param.falsevalue || 'false'; } } - + // find selected case for (var i in input.cases) { if (input.cases[i].value == value) { return i; } } - + // selected case not found return -1; }, - + /** Matches identifier from api model to input elements */ matchModel: function(model, callback) { // final result dictionary var result = {}; - + // link this var self = this; - + // search throughout response function search (id, head) { for (var i in head) { @@ -224,23 +219,23 @@ } } } - + // match all ids and return messages search('', model.inputs); // return matched results return result; }, - + /** Matches identifier from api response to input elements */ matchResponse: function(response) { // final result dictionary var result = {}; - + // link this var self = this; - + // search throughout response function search (id, head) { if (typeof head === 'string') { @@ -262,14 +257,14 @@ } } } - + // match all ids and return messages search('', response); - + // return matched results return result; }, - + /** Iterate through the tool form dom and map it to the dictionary. */ _iterate: function(parent, dict) { @@ -279,15 +274,15 @@ children.each(function() { // get child element var child = this; - + // get id var id = $(child).attr('id'); - + // create new branch if ($(child).hasClass('section-row')) { // create sub dictionary dict[id] = {}; - + // add input element if it exists var input = self.app.input_list[id]; if (input) { @@ -295,7 +290,7 @@ input : input } } - + // fill sub dictionary self._iterate(child, dict[id]); } else { diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 static/scripts/packed/mvc/tools/tools-form-workflow.js --- a/static/scripts/packed/mvc/tools/tools-form-workflow.js +++ b/static/scripts/packed/mvc/tools/tools-form-workflow.js @@ -1,1 +1,1 @@ -define(["utils/utils","mvc/tools/tools-form-base"],function(b,a){var c=a.extend({initialize:function(e){this.node=workflow.active_node;if(!this.node){console.debug("FAILED - tools-form-workflow:initialize() - Node not found in workflow.");return}this.post_job_actions=this.node.post_job_actions||{};this.options=e;this.options.text_enable="In Advance";this.options.text_disable="At Runtime";this.options.is_dynamic=false;this.options.narrow=true;this.options.initial_errors=true;this.options.cls_portlet="ui-portlet-narrow";b.deepeach(e.inputs,function(f){if(f.type){f.optional=(["data","data_hidden","hidden","drill_down","repeat","conditional"]).indexOf(f.type)==-1}});b.deepeach(e.inputs,function(f){if(f.type){if(f.type=="conditional"){f.test_param.optional=false}}});var d=this;b.get({url:galaxy_config.root+"api/datatypes",cache:true,success:function(f){d.datatypes=f;d._makeSections(e.inputs);a.prototype.initialize.call(d,e)}})},_makeSections:function(d){d[b.uuid()]={label:"Annotation / Notes",name:"annotation",type:"text",area:true,help:"Add an annotation or note for this step. It will be shown with the workflow.",value:this.node.annotation};var f=this.node.output_terminals&&Object.keys(this.node.output_terminals)[0];if(f){d[b.uuid()]={name:"pja__"+f+"__EmailAction",label:"Email notification",type:"boolean",value:String(Boolean(this.post_job_actions["EmailAction"+f])),ignore:"false",help:"An email notification will be send when the job has completed.",payload:{host:window.location.host}};d[b.uuid()]={name:"pja__"+f+"__DeleteIntermediatesAction",label:"Output cleanup",type:"boolean",value:String(Boolean(this.post_job_actions["DeleteIntermediatesAction"+f])),ignore:"false",help:"Delete intermediate outputs if they are not used as input for another job."};for(var e in this.node.output_terminals){d[b.uuid()]=this._makeSection(e)}}},_makeSection:function(h){var g=[];for(key in this.datatypes){g.push({0:this.datatypes[key],1:this.datatypes[key]})}g.sort(function(j,i){return j.label>i.label?1:j.label<i.label?-1:0});g.unshift({0:"Sequences",1:"Sequences"});g.unshift({0:"Roadmaps",1:"Roadmaps"});g.unshift({0:"Leave unchanged",1:""});var f={label:"Add Actions: '"+h+"'",type:"section",inputs:[{action:"RenameDatasetAction",argument:"newname",label:"Rename dataset",type:"text",value:"",ignore:"",help:'This action will rename the result dataset. Click <a href="https://wiki.galaxyproject.org/Learn/AdvancedWorkflow/Variables">here</a> for more information.'},{action:"ChangeDatatypeAction",argument:"newtype",label:"Change datatype",type:"select",ignore:"",options:g,help:"This action will change the datatype of the output to the indicated value."},{action:"TagDatasetAction",argument:"tags",label:"Tags",type:"text",value:"",ignore:"",help:"This action will set tags for the dataset."},{label:"Assign columns",type:"section",inputs:[{action:"ColumnSetAction",argument:"chromCol",label:"Chrom column",type:"integer",value:"",ignore:""},{action:"ColumnSetAction",argument:"startCol",label:"Start column",type:"integer",value:"",ignore:""},{action:"ColumnSetAction",argument:"endCol",label:"End column",type:"integer",value:"",ignore:""},{action:"ColumnSetAction",argument:"strandCol",label:"Strand column",type:"integer",value:"",ignore:""},{action:"ColumnSetAction",argument:"nameCol",label:"Name column",type:"integer",value:"",ignore:""}],help:"This action will set column assignments in the output dataset. Blank fields are ignored."}]};var d=this;function e(n,o){o=o||[];o.push(n);for(var m in n.inputs){var k=n.inputs[m];if(k.action){k.name="pja__"+h+"__"+k.action;if(k.argument){k.name+="__"+k.argument}if(k.payload){for(var s in k.payload){var q=k.payload[s];k.payload[k.name+"__"+s]=q;delete q}}var r=d.post_job_actions[k.action+h];if(r){for(var l in o){o[l].expand=true}if(k.argument){k.value=r.action_arguments&&r.action_arguments[k.argument]||k.value}else{k.value="true"}}}if(k.inputs){e(k,o.slice(0))}}}e(f);return f},_buildModel:function(){Galaxy.modal.show({title:"Coming soon...",body:"This feature has not been implemented yet.",buttons:{Close:function(){Galaxy.modal.hide()}}})},_updateModel:function(){var d=this;var e=this.tree.finalize();console.debug("tools-form-workflow::_refreshForm() - Refreshing states.");console.debug(e);var g=this.deferred.register();var f=galaxy_config.root+"workflow/editor_form_post?tool_id="+this.options.id+"&__is_dynamic__=False";b.request({type:"GET",url:f,data:e,success:function(h){d.node.update_field_data(h);d._errors(h&&h.tool_model);d.deferred.done(g);console.debug("tools-form::_refreshForm() - States refreshed.");console.debug(h)},error:function(h){d.deferred.done(g);console.debug("tools-form::_refreshForm() - Refresh request failed.");console.debug(h)}})}});return{View:c}}); \ No newline at end of file +define(["utils/utils","mvc/tools/tools-form-base"],function(b,a){var c=a.extend({initialize:function(e){this.node=workflow.active_node;if(!this.node){console.debug("FAILED - tools-form-workflow:initialize() - Node not found in workflow.");return}this.post_job_actions=this.node.post_job_actions||{};this.options=e;this.options.text_enable="In Advance";this.options.text_disable="At Runtime";this.options.is_dynamic=false;this.options.narrow=true;this.options.initial_errors=true;this.options.cls_portlet="ui-portlet-narrow";b.deepeach(e.inputs,function(f){if(f.type){f.optional=(["data","data_hidden","hidden","drill_down","repeat","conditional"]).indexOf(f.type)==-1}});b.deepeach(e.inputs,function(f){if(f.type){if(f.type=="conditional"){f.test_param.optional=false}}});var d=this;b.get({url:galaxy_config.root+"api/datatypes",cache:true,success:function(f){d.datatypes=f;d._makeSections(e.inputs);a.prototype.initialize.call(d,e)}})},_makeSections:function(d){d[b.uuid()]={label:"Annotation / Notes",name:"annotation",type:"text",area:true,help:"Add an annotation or note for this step. It will be shown with the workflow.",value:this.node.annotation};var f=this.node.output_terminals&&Object.keys(this.node.output_terminals)[0];if(f){d[b.uuid()]={name:"pja__"+f+"__EmailAction",label:"Email notification",type:"boolean",value:String(Boolean(this.post_job_actions["EmailAction"+f])),ignore:"false",help:"An email notification will be send when the job has completed.",payload:{host:window.location.host}};d[b.uuid()]={name:"pja__"+f+"__DeleteIntermediatesAction",label:"Output cleanup",type:"boolean",value:String(Boolean(this.post_job_actions["DeleteIntermediatesAction"+f])),ignore:"false",help:"Delete intermediate outputs if they are not used as input for another job."};for(var e in this.node.output_terminals){d[b.uuid()]=this._makeSection(e)}}},_makeSection:function(h){var g=[];for(key in this.datatypes){g.push({0:this.datatypes[key],1:this.datatypes[key]})}g.sort(function(j,i){return j.label>i.label?1:j.label<i.label?-1:0});g.unshift({0:"Sequences",1:"Sequences"});g.unshift({0:"Roadmaps",1:"Roadmaps"});g.unshift({0:"Leave unchanged",1:""});var f={label:"Add Actions: '"+h+"'",type:"section",inputs:[{action:"RenameDatasetAction",argument:"newname",label:"Rename dataset",type:"text",value:"",ignore:"",help:'This action will rename the result dataset. Click <a href="https://wiki.galaxyproject.org/Learn/AdvancedWorkflow/Variables">here</a> for more information.'},{action:"ChangeDatatypeAction",argument:"newtype",label:"Change datatype",type:"select",ignore:"",options:g,help:"This action will change the datatype of the output to the indicated value."},{action:"TagDatasetAction",argument:"tags",label:"Tags",type:"text",value:"",ignore:"",help:"This action will set tags for the dataset."},{label:"Assign columns",type:"section",inputs:[{action:"ColumnSetAction",argument:"chromCol",label:"Chrom column",type:"integer",value:"",ignore:""},{action:"ColumnSetAction",argument:"startCol",label:"Start column",type:"integer",value:"",ignore:""},{action:"ColumnSetAction",argument:"endCol",label:"End column",type:"integer",value:"",ignore:""},{action:"ColumnSetAction",argument:"strandCol",label:"Strand column",type:"integer",value:"",ignore:""},{action:"ColumnSetAction",argument:"nameCol",label:"Name column",type:"integer",value:"",ignore:""}],help:"This action will set column assignments in the output dataset. Blank fields are ignored."}]};var d=this;function e(n,o){o=o||[];o.push(n);for(var m in n.inputs){var k=n.inputs[m];if(k.action){k.name="pja__"+h+"__"+k.action;if(k.argument){k.name+="__"+k.argument}if(k.payload){for(var s in k.payload){var q=k.payload[s];k.payload[k.name+"__"+s]=q;delete q}}var r=d.post_job_actions[k.action+h];if(r){for(var l in o){o[l].expand=true}if(k.argument){k.value=r.action_arguments&&r.action_arguments[k.argument]||k.value}else{k.value="true"}}}if(k.inputs){e(k,o.slice(0))}}}e(f);return f},_buildModel:function(){Galaxy.modal.show({title:"Coming soon...",body:"This feature has not been implemented yet.",buttons:{Close:function(){Galaxy.modal.hide()}}})},_updateModel:function(){var d=this;var e={tool_id:this.options.id,tool_version:this.options.version,inputs:this.tree.finalize()};console.debug("tools-form-workflow::_refreshForm() - Refreshing states.");console.debug(e);var g=this.deferred.register();var f=galaxy_config.root+"api/workflows/build_module";b.request({type:"POST",url:f,data:e,success:function(h){d.node.update_field_data(h);d._errors(h&&h.tool_model);d.deferred.done(g);console.debug("tools-form::_refreshForm() - States refreshed.");console.debug(h)},error:function(h){d.deferred.done(g);console.debug("tools-form::_refreshForm() - Refresh request failed.");console.debug(h)}})}});return{View:c}}); \ No newline at end of file diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 static/scripts/packed/mvc/tools/tools-tree.js --- a/static/scripts/packed/mvc/tools/tools-tree.js +++ b/static/scripts/packed/mvc/tools/tools-tree.js @@ -1,1 +1,1 @@ -define(["utils/utils"],function(a){return Backbone.Model.extend({initialize:function(b){this.app=b},finalize:function(g){var b=this;this.map_dict={};if(!this.app.section){return{}}g=g||{};var f={};var e={};this._iterate(this.app.section.$el,e);function d(j,i,h){f[j]=h;b.map_dict[j]=i}function c(p,s){for(var n in s){var k=s[n];if(k.input){var u=k.input;var o=p;if(p!=""){o+="|"}o+=u.name;switch(u.type){case"repeat":var j="section-";var x=[];var r=null;for(var w in k){var q=w.indexOf(j);if(q!=-1){q+=j.length;x.push(parseInt(w.substr(q)));if(!r){r=w.substr(0,q)}}}x.sort(function(y,i){return y-i});var n=0;for(var l in x){c(o+"_"+n++,k[r+x[l]])}break;case"conditional":var v=b.app.field_list[u.id].value();if(g[u.test_param.type]){v=g[u.test_param.type](v)}d(o+"|"+u.test_param.name,u.id,v);var h=b.matchCase(u,v);if(h!=-1){c(o,s[u.id+"-section-"+h])}break;case"section":c("",k);break;default:var t=b.app.field_list[u.id];if(t&&t.value){var v=t.value();if(g[u.type]){v=g[u.type](v)}if(t.skip){continue}if(t.validate&&!t.validate()){v=null}if(u.ignore===undefined||(v!==null&&u.ignore!=v)){d(o,u.id,v);if(u.payload){for(var m in u.payload){d(m,u.id,u.payload[m])}}}}}}}}c("",e);return f},match:function(b){return this.map_dict&&this.map_dict[b]},matchCase:function(b,d){if(b.test_param.type=="boolean"){if(d=="true"){d=b.test_param.truevalue||"true"}else{d=b.test_param.falsevalue||"false"}}for(var c in b.cases){if(b.cases[c].value==d){return c}}return -1},matchModel:function(d,f){var b={};var c=this;function e(g,p){for(var m in p){var k=p[m];var n=k.name;if(g!=""){n=g+"|"+n}switch(k.type){case"repeat":for(var l in k.cache){e(n+"_"+l,k.cache[l])}break;case"conditional":var q=k.test_param&&k.test_param.value;var h=c.matchCase(k,q);if(h!=-1){e(n,k.cases[h].inputs)}break;default:var o=c.map_dict[n];if(o){f(o,k)}}}}e("",d.inputs);return b},matchResponse:function(d){var b={};var c=this;function e(l,j){if(typeof j==="string"){var g=c.map_dict[l];if(g){b[g]=j}}else{for(var h in j){var f=h;if(l!==""){var k="|";if(j instanceof Array){k="_"}f=l+k+f}e(f,j[h])}}}e("",d);return b},_iterate:function(d,e){var b=this;var c=$(d).children();c.each(function(){var h=this;var g=$(h).attr("id");if($(h).hasClass("section-row")){e[g]={};var f=b.app.input_list[g];if(f){e[g]={input:f}}b._iterate(h,e[g])}else{b._iterate(h,e)}})}})}); \ No newline at end of file +define(["utils/utils"],function(a){return Backbone.Model.extend({initialize:function(b){this.app=b},finalize:function(g){var b=this;this.map_dict={};if(!this.app.section){return{}}g=g||{};var f={};var e={};this._iterate(this.app.section.$el,e);function d(j,i,h){f[j]=h;b.map_dict[j]=i}function c(p,s){for(var n in s){var k=s[n];if(k.input){var u=k.input;var o=p;if(p!=""){o+="|"}o+=u.name;switch(u.type){case"repeat":var j="section-";var x=[];var r=null;for(var w in k){var q=w.indexOf(j);if(q!=-1){q+=j.length;x.push(parseInt(w.substr(q)));if(!r){r=w.substr(0,q)}}}x.sort(function(y,i){return y-i});var n=0;for(var l in x){c(o+"_"+n++,k[r+x[l]])}break;case"conditional":var v=b.app.field_list[u.id].value();if(g[u.test_param.type]){v=g[u.test_param.type](v)}d(o+"|"+u.test_param.name,u.id,v);var h=b.matchCase(u,v);if(h!=-1){c(o,s[u.id+"-section-"+h])}break;case"section":c("",k);break;default:var t=b.app.field_list[u.id];if(t&&t.value){var v=t.value();if(t.validate&&!t.validate()){v=null}if(g[u.type]){v=g[u.type](v)}if(u.ignore===undefined||(v!==null&&u.ignore!=v)){d(o,u.id,v);if(u.payload){for(var m in u.payload){d(m,u.id,u.payload[m])}}}}}}}}c("",e);return f},match:function(b){return this.map_dict&&this.map_dict[b]},matchCase:function(b,d){if(b.test_param.type=="boolean"){if(d=="true"){d=b.test_param.truevalue||"true"}else{d=b.test_param.falsevalue||"false"}}for(var c in b.cases){if(b.cases[c].value==d){return c}}return -1},matchModel:function(d,f){var b={};var c=this;function e(g,p){for(var m in p){var k=p[m];var n=k.name;if(g!=""){n=g+"|"+n}switch(k.type){case"repeat":for(var l in k.cache){e(n+"_"+l,k.cache[l])}break;case"conditional":var q=k.test_param&&k.test_param.value;var h=c.matchCase(k,q);if(h!=-1){e(n,k.cases[h].inputs)}break;default:var o=c.map_dict[n];if(o){f(o,k)}}}}e("",d.inputs);return b},matchResponse:function(d){var b={};var c=this;function e(l,j){if(typeof j==="string"){var g=c.map_dict[l];if(g){b[g]=j}}else{for(var h in j){var f=h;if(l!==""){var k="|";if(j instanceof Array){k="_"}f=l+k+f}e(f,j[h])}}}e("",d);return b},_iterate:function(d,e){var b=this;var c=$(d).children();c.each(function(){var h=this;var g=$(h).attr("id");if($(h).hasClass("section-row")){e[g]={};var f=b.app.input_list[g];if(f){e[g]={input:f}}b._iterate(h,e[g])}else{b._iterate(h,e)}})}})}); \ No newline at end of file diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 templates/webapps/galaxy/tool_form.mako --- a/templates/webapps/galaxy/tool_form.mako +++ b/templates/webapps/galaxy/tool_form.mako @@ -10,7 +10,7 @@ ## This avoids making two separate requests since the classic form requires the mako anyway. params = dict(trans.request.params) params['__dataset_id__'] = params.get('id', None) - self.form_config = tool.to_json(trans, **params) + self.form_config = tool.to_json(trans, params) self.form_config.update({ 'id' : tool.id, 'job_id' : trans.security.encode_id( job.id ) if job else None, diff -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 -r de8fa2d2312eaad8178fe9aa39a2278bae7da239 templates/webapps/galaxy/workflow/editor_tool_form.mako --- a/templates/webapps/galaxy/workflow/editor_tool_form.mako +++ b/templates/webapps/galaxy/workflow/editor_tool_form.mako @@ -6,11 +6,9 @@ ## TEMPORARY: create tool dictionary in mako while both tool forms are in use. ## This avoids making two separate requests since the classic form requires the mako anyway. from galaxy.tools.parameters import params_to_incoming - incoming = { - '__is_dynamic__' : False - } + incoming = {} params_to_incoming( incoming, tool.inputs, module.state.inputs, trans.app, to_html=False) - self.form_config = tool.to_json(trans, **incoming) + self.form_config = tool.to_json(trans, incoming, is_dynamic=False) self.form_config.update({ 'id' : tool.id, 'job_id' : trans.security.encode_id( job.id ) if job else None, 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: Link to "easiest ways to start" card in CONTRIBUTING.md.
by commits-noreply＠bitbucket.org 09 Feb '15

09 Feb '15

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/28126538ef19/ Changeset: 28126538ef19 User: jmchilton Date: 2015-02-08 23:17:10+00:00 Summary: Link to "easiest ways to start" card in CONTRIBUTING.md. Affected #: 1 file diff -r 7ad7c739fd195596fec28531fe55830cf7a3039e -r 28126538ef19e8dc9d5a5dede2ccf3080ccdf603 CONTRIBUTING.md --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -81,6 +81,13 @@ * A description of how to test the change. +## Ideas + +Galaxy's [Trello board](http://bit.ly/gxytrello) is filled with bugs and ideas +for enhancements, but we maintain a [card](https://trello.com/c/eFdPIdIB) with +links to smaller issues we believe would make the best entry points for new +developers. + ## A Quick Note about Tools For the most part, Galaxy tools should be published to the 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 08 Feb '15

08 Feb '15

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/edc4b7ae61b6/ Changeset: edc4b7ae61b6 User: jmchilton Date: 2015-02-08 20:29:02+00:00 Summary: Add link to actual presentation slides to CONTRIBUTING.md. For people who want to follow along with Dannon at home. Affected #: 1 file diff -r 2c93bedd4898c21ccaa0de413ffedcba91220bb1 -r edc4b7ae61b6036b2fdcbe032d35ae3f0a3115f0 CONTRIBUTING.md --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,13 @@ # Contributing This document briefly describes how to contribute to the -galaxy-central core project - also checkout the video of our [2013 -Galaxy Community Conference -presentation](http://vimeo.com/channels/581875/73486255) on the -topic. For information on contributing more broadly to the Galaxy -ecosystem and a deeper discussion of some of these points - please see -the [Develop](https://wiki.galaxyproject.org/Develop/) section of the +galaxy-central core project - also checkout our 2013 Galaxy Community +Conference presentation] on the topic +([video](http://vimeo.com/channels/581875/73486255), +[presentation](https://wiki.galaxyproject.org/Documents/Presentations/GCC2013?action=AttachFile&do=view&target=BakerContribute.pdf)). For +information on contributing more broadly to the Galaxy ecosystem and a +deeper discussion of some of these points - please see the +[Develop](https://wiki.galaxyproject.org/Develop/) section of the [Galaxy Wiki](https://wiki.galaxyproject.org/). ## Before you Begin https://bitbucket.org/galaxy/galaxy-central/commits/7ad7c739fd19/ Changeset: 7ad7c739fd19 User: jmchilton Date: 2015-02-08 20:31:45+00:00 Summary: Merge. Affected #: 3 files diff -r edc4b7ae61b6036b2fdcbe032d35ae3f0a3115f0 -r 7ad7c739fd195596fec28531fe55830cf7a3039e lib/galaxy/forms/forms.py --- a/lib/galaxy/forms/forms.py +++ b/lib/galaxy/forms/forms.py @@ -50,7 +50,7 @@ #load fields fields = [] fields_elem = elem.find( 'fields' ) - if fields_elem: + if fields_elem is not None: for field_elem in fields_elem.findall( 'field' ): field_type = field_elem.get( 'type' ) assert field_type in self.field_type_factories, 'Invalid form field type ( %s ).' % field_type diff -r edc4b7ae61b6036b2fdcbe032d35ae3f0a3115f0 -r 7ad7c739fd195596fec28531fe55830cf7a3039e lib/galaxy/sample_tracking/external_service_types.py --- a/lib/galaxy/sample_tracking/external_service_types.py +++ b/lib/galaxy/sample_tracking/external_service_types.py @@ -96,9 +96,9 @@ def parse_run_details( self, root ): self.run_details = {} run_details_elem = root.find( 'run_details' ) - if run_details_elem: + if run_details_elem is not None: results_elem = run_details_elem.find( 'results' ) - if results_elem: + if results_elem is not None: # Get the list of resulting datatypes # TODO: the 'results_urls' attribute is only useful if the transfer protocol is http(s), so check if that is the case. self.run_details[ 'results' ], self.run_details[ 'results_urls' ] = self.parse_run_details_results( results_elem ) diff -r edc4b7ae61b6036b2fdcbe032d35ae3f0a3115f0 -r 7ad7c739fd195596fec28531fe55830cf7a3039e lib/galaxy/workflow/scheduling_manager.py --- a/lib/galaxy/workflow/scheduling_manager.py +++ b/lib/galaxy/workflow/scheduling_manager.py @@ -31,11 +31,11 @@ self.app = app self.__job_config = app.job_config self.workflow_schedulers = {} - self.active_workflow_schedulers = {} # Passive workflow schedulers - # won't need to be monitored I - # guess. + self.active_workflow_schedulers = {} + # Passive workflow schedulers won't need to be monitored I guess. + self.request_monitor = None - + self.__plugin_classes = self.__plugins_dict() self.__init_schedulers() @@ -67,7 +67,7 @@ try: self.request_monitor.shutdown() except Exception: - log.exception( "Failed to shutdown worklfow request monitor." ) + log.exception( "Failed to shutdown workflow request monitor." ) def queue( self, workflow_invocation, request_params ): workflow_invocation.state = model.WorkflowInvocation.states.NEW @@ -112,8 +112,7 @@ def __init_schedulers_for_element( self, plugins_element ): plugins_kwds = dict( plugins_element.items() ) self.default_scheduler_id = plugins_kwds.get( 'default', DEFAULT_SCHEDULER_ID ) - - for plugin_element in plugins_element.getchildren(): + for plugin_element in plugins_element: plugin_type = plugin_element.tag plugin_kwds = dict( plugin_element.items() ) workflow_scheduler_id = plugin_kwds.get( 'id', None ) @@ -134,7 +133,7 @@ self.workflow_schedulers[ workflow_scheduler_id ] = workflow_scheduler if isinstance( workflow_scheduler, galaxy.workflow.schedulers.ActiveWorkflowSchedulingPlugin ): self.active_workflow_schedulers[ workflow_scheduler_id ] = workflow_scheduler - + def __start_request_monitor( self ): self.request_monitor = WorkflowRequestMonitor( self.app, self ) 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: 3 new changesets
by commits-noreply＠bitbucket.org 08 Feb '15

08 Feb '15

3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b654710d5844/ Changeset: b654710d5844 User: dannon Date: 2015-02-08 16:16:14+00:00 Summary: Fix a few instances of incorrect (deprecated) use of value instead of identity testing in xml parsing. Affected #: 3 files diff -r 1b09e60f84db859ae49bed71c6f3fd838af612f5 -r b654710d58445917baae8e3ec8f78acc745ef262 lib/galaxy/forms/forms.py --- a/lib/galaxy/forms/forms.py +++ b/lib/galaxy/forms/forms.py @@ -50,7 +50,7 @@ #load fields fields = [] fields_elem = elem.find( 'fields' ) - if fields_elem: + if fields_elem is not None: for field_elem in fields_elem.findall( 'field' ): field_type = field_elem.get( 'type' ) assert field_type in self.field_type_factories, 'Invalid form field type ( %s ).' % field_type diff -r 1b09e60f84db859ae49bed71c6f3fd838af612f5 -r b654710d58445917baae8e3ec8f78acc745ef262 lib/galaxy/sample_tracking/external_service_types.py --- a/lib/galaxy/sample_tracking/external_service_types.py +++ b/lib/galaxy/sample_tracking/external_service_types.py @@ -96,9 +96,9 @@ def parse_run_details( self, root ): self.run_details = {} run_details_elem = root.find( 'run_details' ) - if run_details_elem: + if run_details_elem is not None: results_elem = run_details_elem.find( 'results' ) - if results_elem: + if results_elem is not None: # Get the list of resulting datatypes # TODO: the 'results_urls' attribute is only useful if the transfer protocol is http(s), so check if that is the case. self.run_details[ 'results' ], self.run_details[ 'results_urls' ] = self.parse_run_details_results( results_elem ) diff -r 1b09e60f84db859ae49bed71c6f3fd838af612f5 -r b654710d58445917baae8e3ec8f78acc745ef262 lib/galaxy/workflow/scheduling_manager.py --- a/lib/galaxy/workflow/scheduling_manager.py +++ b/lib/galaxy/workflow/scheduling_manager.py @@ -112,8 +112,7 @@ def __init_schedulers_for_element( self, plugins_element ): plugins_kwds = dict( plugins_element.items() ) self.default_scheduler_id = plugins_kwds.get( 'default', DEFAULT_SCHEDULER_ID ) - - for plugin_element in plugins_element.getchildren(): + for plugin_element in plugins_element: plugin_type = plugin_element.tag plugin_kwds = dict( plugin_element.items() ) workflow_scheduler_id = plugin_kwds.get( 'id', None ) https://bitbucket.org/galaxy/galaxy-central/commits/a02abac7d68d/ Changeset: a02abac7d68d User: dannon Date: 2015-02-08 16:21:42+00:00 Summary: Minor formatting, spelling in workflow scheduling_manager. Affected #: 1 file diff -r b654710d58445917baae8e3ec8f78acc745ef262 -r a02abac7d68dd4decd91e5a24022dc6648bf011c lib/galaxy/workflow/scheduling_manager.py --- a/lib/galaxy/workflow/scheduling_manager.py +++ b/lib/galaxy/workflow/scheduling_manager.py @@ -31,11 +31,11 @@ self.app = app self.__job_config = app.job_config self.workflow_schedulers = {} - self.active_workflow_schedulers = {} # Passive workflow schedulers - # won't need to be monitored I - # guess. + self.active_workflow_schedulers = {} + # Passive workflow schedulers won't need to be monitored I guess. + self.request_monitor = None - + self.__plugin_classes = self.__plugins_dict() self.__init_schedulers() @@ -67,7 +67,7 @@ try: self.request_monitor.shutdown() except Exception: - log.exception( "Failed to shutdown worklfow request monitor." ) + log.exception( "Failed to shutdown workflow request monitor." ) def queue( self, workflow_invocation, request_params ): workflow_invocation.state = model.WorkflowInvocation.states.NEW @@ -133,7 +133,7 @@ self.workflow_schedulers[ workflow_scheduler_id ] = workflow_scheduler if isinstance( workflow_scheduler, galaxy.workflow.schedulers.ActiveWorkflowSchedulingPlugin ): self.active_workflow_schedulers[ workflow_scheduler_id ] = workflow_scheduler - + def __start_request_monitor( self ): self.request_monitor = WorkflowRequestMonitor( self.app, self ) https://bitbucket.org/galaxy/galaxy-central/commits/ea23071cf22e/ Changeset: ea23071cf22e User: dannon Date: 2015-02-08 20:09:23+00:00 Summary: Merge. Affected #: 1 file diff -r a02abac7d68dd4decd91e5a24022dc6648bf011c -r ea23071cf22ea78b699264e04b59e3adf88ec619 CONTRIBUTING.md --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,93 @@ +# Contributing + +This document briefly describes how to contribute to the +galaxy-central core project - also checkout the video of our [2013 +Galaxy Community Conference +presentation](http://vimeo.com/channels/581875/73486255) on the +topic. For information on contributing more broadly to the Galaxy +ecosystem and a deeper discussion of some of these points - please see +the [Develop](https://wiki.galaxyproject.org/Develop/) section of the +[Galaxy Wiki](https://wiki.galaxyproject.org/). + +## Before you Begin + +If you have an idea for a feature to add or an approach for a bugfix - +it is best to communicate with Galaxy developers early. The most +common venue for this is the [Galaxy Trello +board](https://wiki.galaxyproject.org/Issues). Browse through existing +cards [here](http://bit.ly/gxytrello) and if one seems related comment +on it. If no existing cards seem appropriate, a new issue can be +opened using [this form](http://galaxyproject.org/trello). Galaxy +developers are also generally available via +[IRC](https://wiki.galaxyproject.org/GetInvolved#IRC_Channel) and on +the [development mailing list](http://dev.list.galaxyproject.org/). + +## How to Contribute + +* If you are new to Mercurial - please check out this [official + tutorial](http://mercurial.selenic.com/wiki/Tutorial) + +* Make sure you have a free [Bitbucket + account](https://bitbucket.org/account/signup/) + +* Fork the galaxy-central repository on + [Bitbucket](https://bitbucket.org/galaxy/galaxy-central/fork) to + make your changes. (Many Galaxy instances target + [galaxy-dist](https://bitbucket.org/galaxy/galaxy-dist) - but active + development happens on galaxy-central and this is where pull + requests should be made). + +* Choose the correct Mercurial branch to develop your changes against. + + * Additions to the code base should be pushed to the `default` + branch (`hg checkout default`). + + * Most bug fixes to previously release components (things in + galaxy-dist) should be pushed to the `stable` branch (`hg checkout + stable`). + + * Serious security problems should not be fixed via pull request - + please responsibly disclose these by e-mailing them (with or + without patches) to galaxy-lab(a)bx.psu.edu. The Galaxy core + development team will issue patches to public servers before + announcing the issue to ensure there is time to patch and + highlight these fixes widely. We will provide you credit for the + discovery when publicly disclosing the issue. + +* If your changes modify code - please ensure the resulting files + conform to Galaxy [style + guidelines](https://wiki.galaxyproject.org/Develop/BestPractices). + +* Galaxy contains hundreds of tests of different types and complexity + and running each is difficult and probably not reasonable at this + time (someday we will provide a holistic test procedure to make this + possible). For now, please just review the [running tests + documentation](https://wiki.galaxyproject.org/Admin/RunningTests) + and run any that seem relevant. Developers reviewing your pull + request will be happy to help guide you to running the most relevant + tests as part of the pull request review process and may request the + output of these tests. + +* Commit and push your changes to your Bitbucket fork. + +* Open a [pull + request](https://confluence.atlassian.com/display/BITBUCKET/Fork+a+Repo,+Co… + with these changes. You pull request message should include: + + * A description of why the change should be made. + + * A description of implementation of the change. + + * A description of how to test the change. + +## A Quick Note about Tools + + For the most part, Galaxy tools should be published to the + [ToolShed](https://wiki.galaxyproject.org/ToolShed) and not in this + repository directly. If you are looking to supply fixes for migrated + core tools that used to exist in this repository - please checkout + the [tools-devteam](https://github.com/galaxyproject/tools-devteam) + repository on GitHub. + + More information about tool development can be found [on the + wiki](https://wiki.galaxyproject.org/Develop). 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: First crack at a CONTRIBUTING file for galaxy-central.
by commits-noreply＠bitbucket.org 08 Feb '15

08 Feb '15

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/2c93bedd4898/ Changeset: 2c93bedd4898 User: jmchilton Date: 2015-02-08 20:02:54+00:00 Summary: First crack at a CONTRIBUTING file for galaxy-central. Ideally this would come in through a pull request but I am trying to rush through documentation related to Galaxy development ahead of a GSOC application - by all means I would encourage comments related to this commit as well as well as direct modifications. CONTRIBUTING files are meant to encourge developers to contribute to open source projects by spelling out how to contribute and what is expected from contributions. More resources related to CONTRIBUTION files include: - http://contribute.md/ - https://github.com/blog/1184-contributing-guidelines This isn't coming at the expense of wiki documentation - I have already made dozens of enhancements to the Develop section of the wiki today and I am planning a huge walkthrough of how to contribute and learn about various aspect of the broader Galaxy community from a new developer perspective. Having this file in place though I feel is an important part of that however. Affected #: 1 file diff -r 1b09e60f84db859ae49bed71c6f3fd838af612f5 -r 2c93bedd4898c21ccaa0de413ffedcba91220bb1 CONTRIBUTING.md --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,93 @@ +# Contributing + +This document briefly describes how to contribute to the +galaxy-central core project - also checkout the video of our [2013 +Galaxy Community Conference +presentation](http://vimeo.com/channels/581875/73486255) on the +topic. For information on contributing more broadly to the Galaxy +ecosystem and a deeper discussion of some of these points - please see +the [Develop](https://wiki.galaxyproject.org/Develop/) section of the +[Galaxy Wiki](https://wiki.galaxyproject.org/). + +## Before you Begin + +If you have an idea for a feature to add or an approach for a bugfix - +it is best to communicate with Galaxy developers early. The most +common venue for this is the [Galaxy Trello +board](https://wiki.galaxyproject.org/Issues). Browse through existing +cards [here](http://bit.ly/gxytrello) and if one seems related comment +on it. If no existing cards seem appropriate, a new issue can be +opened using [this form](http://galaxyproject.org/trello). Galaxy +developers are also generally available via +[IRC](https://wiki.galaxyproject.org/GetInvolved#IRC_Channel) and on +the [development mailing list](http://dev.list.galaxyproject.org/). + +## How to Contribute + +* If you are new to Mercurial - please check out this [official + tutorial](http://mercurial.selenic.com/wiki/Tutorial) + +* Make sure you have a free [Bitbucket + account](https://bitbucket.org/account/signup/) + +* Fork the galaxy-central repository on + [Bitbucket](https://bitbucket.org/galaxy/galaxy-central/fork) to + make your changes. (Many Galaxy instances target + [galaxy-dist](https://bitbucket.org/galaxy/galaxy-dist) - but active + development happens on galaxy-central and this is where pull + requests should be made). + +* Choose the correct Mercurial branch to develop your changes against. + + * Additions to the code base should be pushed to the `default` + branch (`hg checkout default`). + + * Most bug fixes to previously release components (things in + galaxy-dist) should be pushed to the `stable` branch (`hg checkout + stable`). + + * Serious security problems should not be fixed via pull request - + please responsibly disclose these by e-mailing them (with or + without patches) to galaxy-lab(a)bx.psu.edu. The Galaxy core + development team will issue patches to public servers before + announcing the issue to ensure there is time to patch and + highlight these fixes widely. We will provide you credit for the + discovery when publicly disclosing the issue. + +* If your changes modify code - please ensure the resulting files + conform to Galaxy [style + guidelines](https://wiki.galaxyproject.org/Develop/BestPractices). + +* Galaxy contains hundreds of tests of different types and complexity + and running each is difficult and probably not reasonable at this + time (someday we will provide a holistic test procedure to make this + possible). For now, please just review the [running tests + documentation](https://wiki.galaxyproject.org/Admin/RunningTests) + and run any that seem relevant. Developers reviewing your pull + request will be happy to help guide you to running the most relevant + tests as part of the pull request review process and may request the + output of these tests. + +* Commit and push your changes to your Bitbucket fork. + +* Open a [pull + request](https://confluence.atlassian.com/display/BITBUCKET/Fork+a+Repo,+Co… + with these changes. You pull request message should include: + + * A description of why the change should be made. + + * A description of implementation of the change. + + * A description of how to test the change. + +## A Quick Note about Tools + + For the most part, Galaxy tools should be published to the + [ToolShed](https://wiki.galaxyproject.org/ToolShed) and not in this + repository directly. If you are looking to supply fixes for migrated + core tools that used to exist in this repository - please checkout + the [tools-devteam](https://github.com/galaxyproject/tools-devteam) + repository on GitHub. + + More information about tool development can be found [on the + wiki](https://wiki.galaxyproject.org/Develop). 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 08 Feb '15

08 Feb '15

2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b0ff7d6cfe40/ Changeset: b0ff7d6cfe40 User: jmchilton Date: 2015-02-08 00:32:16+00:00 Summary: Rework control queue setup to work in non-web contexts. Namely in the new lib/galaxy/main.py. I think this break down of the code makes more sense also since control queues aren't inheriently something web-y so lib/galaxy/app.py makes more sense for configuring them. Dannon feel free to reorganize if you dislike this particular organization - I just wanted to make sure lib/galaxy/main.py could share in the new stuff. Affected #: 3 files diff -r 5964dac35d2eb268097632ca65c3abbbdf624716 -r b0ff7d6cfe407ecae40dc761b0970ac2cfaa76e2 lib/galaxy/app.py --- a/lib/galaxy/app.py +++ b/lib/galaxy/app.py @@ -144,6 +144,12 @@ self.model.engine.dispose() + def setup_control_queue(self): + self.control_worker = GalaxyQueueWorker(self, galaxy.queues.control_queue_from_config(self.config), + galaxy.queue_worker.control_message_to_task) + self.control_worker.daemon = True + self.control_worker.start() + def shutdown( self ): self.workflow_scheduling_manager.shutdown() self.job_manager.shutdown() diff -r 5964dac35d2eb268097632ca65c3abbbdf624716 -r b0ff7d6cfe407ecae40dc761b0970ac2cfaa76e2 lib/galaxy/main.py --- a/lib/galaxy/main.py +++ b/lib/galaxy/main.py @@ -101,6 +101,7 @@ global_conf={"__file__": config_builder.ini_path}, **kwds ) + app.setup_control_queue() return app diff -r 5964dac35d2eb268097632ca65c3abbbdf624716 -r b0ff7d6cfe407ecae40dc761b0970ac2cfaa76e2 lib/galaxy/webapps/galaxy/buildapp.py --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -123,14 +123,10 @@ @postfork def postfork_setup(): from galaxy.app import app - from galaxy.queue_worker import GalaxyQueueWorker if app.config.is_uwsgi: import uwsgi app.config.server_name += ".%s" % uwsgi.worker_id() - app.control_worker = GalaxyQueueWorker(app, galaxy.queues.control_queue_from_config(app.config), - galaxy.queue_worker.control_message_to_task) - app.control_worker.daemon = True - app.control_worker.start() + app.setup_control_queue() def populate_api_routes( webapp, app ): https://bitbucket.org/galaxy/galaxy-central/commits/1b09e60f84db/ Changeset: 1b09e60f84db User: jmchilton Date: 2015-02-08 00:32:16+00:00 Summary: Fix running tool tests for recent control reworking. Affected #: 1 file diff -r b0ff7d6cfe407ecae40dc761b0970ac2cfaa76e2 -r 1b09e60f84db859ae49bed71c6f3fd838af612f5 lib/galaxy/webapps/galaxy/buildapp.py --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -47,6 +47,7 @@ # Create the Galaxy application unless passed in if 'app' in kwargs: app = kwargs.pop( 'app' ) + galaxy.app.app = app else: try: app = galaxy.app.UniverseApplication( global_conf=global_conf, **kwargs ) 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: Ui: Use placeholder title
by commits-noreply＠bitbucket.org 07 Feb '15

07 Feb '15

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/5964dac35d2e/ Changeset: 5964dac35d2e User: guerler Date: 2015-02-07 04:32:58+00:00 Summary: Ui: Use placeholder title Affected #: 3 files diff -r 394cf89ac0044524bf1f2dac6971a4d593c714ec -r 5964dac35d2eb268097632ca65c3abbbdf624716 client/galaxy/scripts/mvc/tools/tools-repeat.js --- a/client/galaxy/scripts/mvc/tools/tools-repeat.js +++ b/client/galaxy/scripts/mvc/tools/tools-repeat.js @@ -88,7 +88,7 @@ // create portlet var portlet = new Portlet.View({ id : options.id, - title : '<b>' + options.title + '</b>', + title : 'placeholder', cls : 'ui-portlet-repeat', operations : { button_delete : button_delete diff -r 394cf89ac0044524bf1f2dac6971a4d593c714ec -r 5964dac35d2eb268097632ca65c3abbbdf624716 static/scripts/mvc/tools/tools-repeat.js --- a/static/scripts/mvc/tools/tools-repeat.js +++ b/static/scripts/mvc/tools/tools-repeat.js @@ -88,7 +88,7 @@ // create portlet var portlet = new Portlet.View({ id : options.id, - title : '<b>' + options.title + '</b>', + title : 'placeholder', cls : 'ui-portlet-repeat', operations : { button_delete : button_delete diff -r 394cf89ac0044524bf1f2dac6971a4d593c714ec -r 5964dac35d2eb268097632ca65c3abbbdf624716 static/scripts/packed/mvc/tools/tools-repeat.js --- a/static/scripts/packed/mvc/tools/tools-repeat.js +++ b/static/scripts/packed/mvc/tools/tools-repeat.js @@ -1,1 +1,1 @@ -define(["utils/utils","mvc/ui/ui-table","mvc/ui/ui-portlet","mvc/ui/ui-misc"],function(c,a,b,e){var d=Backbone.View.extend({optionsDefault:{title:"Section",max:null,min:null},initialize:function(g){this.options=c.merge(g,this.optionsDefault);this.setElement("<div/>");var f=this;this.button_new=new e.ButtonIcon({icon:"fa-plus",title:"Insert "+g.title_new,tooltip:"Add new "+g.title_new+" block",floating:"clear",onclick:function(){if(g.onnew){g.onnew()}}});this.table=new a.View({cls:"ui-table-plain",content:""});this.$el.append(this.table.$el);this.$el.append($("<div/>").append(this.button_new.$el));this.list={};this.n=0},size:function(){return this.n},add:function(g){if(!g.id||this.list[g.id]){console.debug("tools-repeat::add - Duplicate repeat block id.");return}this.n++;var f=new e.ButtonIcon({icon:"fa-trash-o",tooltip:"Delete this repeat block",cls:"ui-button-icon-plain",onclick:function(){if(g.ondel){g.ondel()}}});var h=new b.View({id:g.id,title:"<b>"+g.title+"</b>",cls:"ui-portlet-repeat",operations:{button_delete:f}});h.append(g.$el);h.$el.addClass("section-row");this.list[g.id]=h;this.table.add(h.$el);this.table.append("row_"+g.id,true);if(this.options.max>0&&this.n>=this.options.max){this.button_new.disable()}this._refresh()},del:function(g){if(!this.list[g]){console.debug("tools-repeat::del - Invalid repeat block id.");return}this.n--;var f=this.table.get("row_"+g);f.remove();delete this.list[g];this.button_new.enable();this._refresh()},_refresh:function(){var f=0;for(var h in this.list){var g=this.list[h];g.title(++f+": "+this.options.title);if(this.n>this.options.min){g.showOperation("button_delete")}else{g.hideOperation("button_delete")}}}});return{View:d}}); \ No newline at end of file +define(["utils/utils","mvc/ui/ui-table","mvc/ui/ui-portlet","mvc/ui/ui-misc"],function(c,a,b,e){var d=Backbone.View.extend({optionsDefault:{title:"Section",max:null,min:null},initialize:function(g){this.options=c.merge(g,this.optionsDefault);this.setElement("<div/>");var f=this;this.button_new=new e.ButtonIcon({icon:"fa-plus",title:"Insert "+g.title_new,tooltip:"Add new "+g.title_new+" block",floating:"clear",onclick:function(){if(g.onnew){g.onnew()}}});this.table=new a.View({cls:"ui-table-plain",content:""});this.$el.append(this.table.$el);this.$el.append($("<div/>").append(this.button_new.$el));this.list={};this.n=0},size:function(){return this.n},add:function(g){if(!g.id||this.list[g.id]){console.debug("tools-repeat::add - Duplicate repeat block id.");return}this.n++;var f=new e.ButtonIcon({icon:"fa-trash-o",tooltip:"Delete this repeat block",cls:"ui-button-icon-plain",onclick:function(){if(g.ondel){g.ondel()}}});var h=new b.View({id:g.id,title:"placeholder",cls:"ui-portlet-repeat",operations:{button_delete:f}});h.append(g.$el);h.$el.addClass("section-row");this.list[g.id]=h;this.table.add(h.$el);this.table.append("row_"+g.id,true);if(this.options.max>0&&this.n>=this.options.max){this.button_new.disable()}this._refresh()},del:function(g){if(!this.list[g]){console.debug("tools-repeat::del - Invalid repeat block id.");return}this.n--;var f=this.table.get("row_"+g);f.remove();delete this.list[g];this.button_new.enable();this._refresh()},_refresh:function(){var f=0;for(var h in this.list){var g=this.list[h];g.title(++f+": "+this.options.title);if(this.n>this.options.min){g.showOperation("button_delete")}else{g.hideOperation("button_delete")}}}});return{View:d}}); \ No newline at end of file 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: Update repeat blocks
by commits-noreply＠bitbucket.org 07 Feb '15

07 Feb '15

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/394cf89ac004/ Changeset: 394cf89ac004 User: guerler Date: 2015-02-07 04:23:26+00:00 Summary: ToolForm: Update repeat blocks Affected #: 6 files diff -r ade75ceb5427c588756ab888c3944cf4d25ada73 -r 394cf89ac0044524bf1f2dac6971a4d593c714ec client/galaxy/scripts/mvc/tools/tools-repeat.js --- a/client/galaxy/scripts/mvc/tools/tools-repeat.js +++ b/client/galaxy/scripts/mvc/tools/tools-repeat.js @@ -6,7 +6,9 @@ var View = Backbone.View.extend({ // default options optionsDefault : { - max : null + title : 'Section', + max : null, + min : null }, /** Initialize @@ -14,13 +16,13 @@ initialize : function(options) { // configure options this.options = Utils.merge(options, this.optionsDefault); - + // create new element this.setElement('<div/>'); - + // link this var self = this; - + // create button this.button_new = new Ui.ButtonIcon({ icon : 'fa-plus', @@ -33,32 +35,44 @@ } } }); - + // create table this.table = new Table.View({ cls : 'ui-table-plain', content : '' }); - + // append button this.$el.append(this.table.$el); - + // add button this.$el.append($('<div/>').append(this.button_new.$el)); - + // clear list this.list = {}; + + // number of available repeats + this.n = 0; }, - + /** Number of repeat blocks */ size: function() { - return _.size(this.list); + return this.n; }, - + /** Add new repeat block */ add: function(options) { + // repeat block already exists + if (!options.id || this.list[options.id]) { + console.debug('tools-repeat::add - Duplicate repeat block id.'); + return; + } + + // increase repeat block counter + this.n++; + // delete button var button_delete = new Ui.ButtonIcon({ icon : 'fa-trash-o', @@ -70,7 +84,7 @@ } } }); - + // create portlet var portlet = new Portlet.View({ id : options.id, @@ -80,53 +94,67 @@ button_delete : button_delete } }); - - // hide button - if (!options.ondel) { - button_delete.remove(); - } - + // append content portlet.append(options.$el); - + // tag as section row portlet.$el.addClass('section-row'); - + // append to dom this.list[options.id] = portlet; - + // append to dom this.table.add(portlet.$el); this.table.append('row_' + options.id, true); - + // validate maximum - if (this.options.max > 0 && this.size() >= this.options.max) { + if (this.options.max > 0 && this.n >= this.options.max) { this.button_new.disable(); } + + // refresh view + this._refresh(); }, - + /** Delete repeat block */ del: function(id) { - if (this.list[id]) { - // delete table row - var table_row = this.table.get('row_' + id); - table_row.remove(); - - // remove from list - delete this.list[id]; - - // enable new button - this.button_new.enable(); + // could not find element + if (!this.list[id]) { + console.debug('tools-repeat::del - Invalid repeat block id.'); + return; } + + // decrease repeat block counter + this.n--; + + // delete table row + var table_row = this.table.get('row_' + id); + table_row.remove(); + + // remove from list + delete this.list[id]; + + // enable new button + this.button_new.enable(); + + // refresh delete button visibility + this._refresh(); }, - - /** Retitle/Enumerate repeat blocks + + /** Refresh view */ - retitle: function(new_title) { + _refresh: function() { var index = 0; for (var id in this.list) { - this.list[id].title(++index + ': ' + new_title); + var portlet = this.list[id]; + portlet.title(++index + ': ' + this.options.title); + if (this.n > this.options.min) { + portlet.showOperation('button_delete'); + } else { + portlet.hideOperation('button_delete'); + } } } }); diff -r ade75ceb5427c588756ab888c3944cf4d25ada73 -r 394cf89ac0044524bf1f2dac6971a4d593c714ec client/galaxy/scripts/mvc/tools/tools-section.js --- a/client/galaxy/scripts/mvc/tools/tools-section.js +++ b/client/galaxy/scripts/mvc/tools/tools-section.js @@ -161,26 +161,26 @@ // block index var block_index = 0; + // create repeat block element + var repeat = new Repeat.View({ + title : input_def.title, + title_new : input_def.title, + min : input_def.min, + max : input_def.max, + onnew : function() { + // create + create(input_def.inputs); + + // trigger refresh + self.app.trigger('refresh'); + } + }); + // helper function to create new repeat blocks - function create (inputs, deleteable) { + function create (inputs) { // create id tag var sub_section_id = input_def.id + '-section-' + (block_index++); - // enable/disable repeat delete button - var ondel = null; - if (deleteable) { - ondel = function() { - // delete repeat block - repeat.del(sub_section_id); - - // retitle repeat block - repeat.retitle(input_def.title); - - // trigger refresh - self.app.trigger('refresh'); - } - } - // create sub section var sub_section = new View(self.app, { inputs : inputs @@ -189,37 +189,23 @@ // add tab repeat.add({ id : sub_section_id, - title : input_def.title, $el : sub_section.$el, - ondel : ondel + ondel : function() { + // delete repeat block + repeat.del(sub_section_id); + + // trigger refresh + self.app.trigger('refresh'); + } }); - - // retitle repeat block - repeat.retitle(input_def.title); } // - // create repeat block element - // - var repeat = new Repeat.View({ - title_new : input_def.title, - max : input_def.max, - onnew : function() { - // create - create(input_def.inputs, true); - - // trigger refresh - self.app.trigger('refresh'); - } - }); - - // // add parsed/minimum number of repeat blocks // var n_min = input_def.min; var n_cache = _.size(input_def.cache); for (var i = 0; i < Math.max(n_cache, n_min); i++) { - // select input source var inputs = null; if (i < n_cache) { inputs = input_def.cache[i]; @@ -228,7 +214,7 @@ } // create repeat block - create(inputs, i >= n_min); + create(inputs); } // create input field wrapper diff -r ade75ceb5427c588756ab888c3944cf4d25ada73 -r 394cf89ac0044524bf1f2dac6971a4d593c714ec static/scripts/mvc/tools/tools-repeat.js --- a/static/scripts/mvc/tools/tools-repeat.js +++ b/static/scripts/mvc/tools/tools-repeat.js @@ -6,7 +6,9 @@ var View = Backbone.View.extend({ // default options optionsDefault : { - max : null + title : 'Section', + max : null, + min : null }, /** Initialize @@ -14,13 +16,13 @@ initialize : function(options) { // configure options this.options = Utils.merge(options, this.optionsDefault); - + // create new element this.setElement('<div/>'); - + // link this var self = this; - + // create button this.button_new = new Ui.ButtonIcon({ icon : 'fa-plus', @@ -33,32 +35,44 @@ } } }); - + // create table this.table = new Table.View({ cls : 'ui-table-plain', content : '' }); - + // append button this.$el.append(this.table.$el); - + // add button this.$el.append($('<div/>').append(this.button_new.$el)); - + // clear list this.list = {}; + + // number of available repeats + this.n = 0; }, - + /** Number of repeat blocks */ size: function() { - return _.size(this.list); + return this.n; }, - + /** Add new repeat block */ add: function(options) { + // repeat block already exists + if (!options.id || this.list[options.id]) { + console.debug('tools-repeat::add - Duplicate repeat block id.'); + return; + } + + // increase repeat block counter + this.n++; + // delete button var button_delete = new Ui.ButtonIcon({ icon : 'fa-trash-o', @@ -70,7 +84,7 @@ } } }); - + // create portlet var portlet = new Portlet.View({ id : options.id, @@ -80,53 +94,67 @@ button_delete : button_delete } }); - - // hide button - if (!options.ondel) { - button_delete.remove(); - } - + // append content portlet.append(options.$el); - + // tag as section row portlet.$el.addClass('section-row'); - + // append to dom this.list[options.id] = portlet; - + // append to dom this.table.add(portlet.$el); this.table.append('row_' + options.id, true); - + // validate maximum - if (this.options.max > 0 && this.size() >= this.options.max) { + if (this.options.max > 0 && this.n >= this.options.max) { this.button_new.disable(); } + + // refresh view + this._refresh(); }, - + /** Delete repeat block */ del: function(id) { - if (this.list[id]) { - // delete table row - var table_row = this.table.get('row_' + id); - table_row.remove(); - - // remove from list - delete this.list[id]; - - // enable new button - this.button_new.enable(); + // could not find element + if (!this.list[id]) { + console.debug('tools-repeat::del - Invalid repeat block id.'); + return; } + + // decrease repeat block counter + this.n--; + + // delete table row + var table_row = this.table.get('row_' + id); + table_row.remove(); + + // remove from list + delete this.list[id]; + + // enable new button + this.button_new.enable(); + + // refresh delete button visibility + this._refresh(); }, - - /** Retitle/Enumerate repeat blocks + + /** Refresh view */ - retitle: function(new_title) { + _refresh: function() { var index = 0; for (var id in this.list) { - this.list[id].title(++index + ': ' + new_title); + var portlet = this.list[id]; + portlet.title(++index + ': ' + this.options.title); + if (this.n > this.options.min) { + portlet.showOperation('button_delete'); + } else { + portlet.hideOperation('button_delete'); + } } } }); diff -r ade75ceb5427c588756ab888c3944cf4d25ada73 -r 394cf89ac0044524bf1f2dac6971a4d593c714ec static/scripts/mvc/tools/tools-section.js --- a/static/scripts/mvc/tools/tools-section.js +++ b/static/scripts/mvc/tools/tools-section.js @@ -161,26 +161,26 @@ // block index var block_index = 0; + // create repeat block element + var repeat = new Repeat.View({ + title : input_def.title, + title_new : input_def.title, + min : input_def.min, + max : input_def.max, + onnew : function() { + // create + create(input_def.inputs); + + // trigger refresh + self.app.trigger('refresh'); + } + }); + // helper function to create new repeat blocks - function create (inputs, deleteable) { + function create (inputs) { // create id tag var sub_section_id = input_def.id + '-section-' + (block_index++); - // enable/disable repeat delete button - var ondel = null; - if (deleteable) { - ondel = function() { - // delete repeat block - repeat.del(sub_section_id); - - // retitle repeat block - repeat.retitle(input_def.title); - - // trigger refresh - self.app.trigger('refresh'); - } - } - // create sub section var sub_section = new View(self.app, { inputs : inputs @@ -189,37 +189,23 @@ // add tab repeat.add({ id : sub_section_id, - title : input_def.title, $el : sub_section.$el, - ondel : ondel + ondel : function() { + // delete repeat block + repeat.del(sub_section_id); + + // trigger refresh + self.app.trigger('refresh'); + } }); - - // retitle repeat block - repeat.retitle(input_def.title); } // - // create repeat block element - // - var repeat = new Repeat.View({ - title_new : input_def.title, - max : input_def.max, - onnew : function() { - // create - create(input_def.inputs, true); - - // trigger refresh - self.app.trigger('refresh'); - } - }); - - // // add parsed/minimum number of repeat blocks // var n_min = input_def.min; var n_cache = _.size(input_def.cache); for (var i = 0; i < Math.max(n_cache, n_min); i++) { - // select input source var inputs = null; if (i < n_cache) { inputs = input_def.cache[i]; @@ -228,7 +214,7 @@ } // create repeat block - create(inputs, i >= n_min); + create(inputs); } // create input field wrapper diff -r ade75ceb5427c588756ab888c3944cf4d25ada73 -r 394cf89ac0044524bf1f2dac6971a4d593c714ec static/scripts/packed/mvc/tools/tools-repeat.js --- a/static/scripts/packed/mvc/tools/tools-repeat.js +++ b/static/scripts/packed/mvc/tools/tools-repeat.js @@ -1,1 +1,1 @@ -define(["utils/utils","mvc/ui/ui-table","mvc/ui/ui-portlet","mvc/ui/ui-misc"],function(c,a,b,e){var d=Backbone.View.extend({optionsDefault:{max:null},initialize:function(g){this.options=c.merge(g,this.optionsDefault);this.setElement("<div/>");var f=this;this.button_new=new e.ButtonIcon({icon:"fa-plus",title:"Insert "+g.title_new,tooltip:"Add new "+g.title_new+" block",floating:"clear",onclick:function(){if(g.onnew){g.onnew()}}});this.table=new a.View({cls:"ui-table-plain",content:""});this.$el.append(this.table.$el);this.$el.append($("<div/>").append(this.button_new.$el));this.list={}},size:function(){return _.size(this.list)},add:function(g){var f=new e.ButtonIcon({icon:"fa-trash-o",tooltip:"Delete this repeat block",cls:"ui-button-icon-plain",onclick:function(){if(g.ondel){g.ondel()}}});var h=new b.View({id:g.id,title:"<b>"+g.title+"</b>",cls:"ui-portlet-repeat",operations:{button_delete:f}});if(!g.ondel){f.remove()}h.append(g.$el);h.$el.addClass("section-row");this.list[g.id]=h;this.table.add(h.$el);this.table.append("row_"+g.id,true);if(this.options.max>0&&this.size()>=this.options.max){this.button_new.disable()}},del:function(g){if(this.list[g]){var f=this.table.get("row_"+g);f.remove();delete this.list[g];this.button_new.enable()}},retitle:function(g){var f=0;for(var h in this.list){this.list[h].title(++f+": "+g)}}});return{View:d}}); \ No newline at end of file +define(["utils/utils","mvc/ui/ui-table","mvc/ui/ui-portlet","mvc/ui/ui-misc"],function(c,a,b,e){var d=Backbone.View.extend({optionsDefault:{title:"Section",max:null,min:null},initialize:function(g){this.options=c.merge(g,this.optionsDefault);this.setElement("<div/>");var f=this;this.button_new=new e.ButtonIcon({icon:"fa-plus",title:"Insert "+g.title_new,tooltip:"Add new "+g.title_new+" block",floating:"clear",onclick:function(){if(g.onnew){g.onnew()}}});this.table=new a.View({cls:"ui-table-plain",content:""});this.$el.append(this.table.$el);this.$el.append($("<div/>").append(this.button_new.$el));this.list={};this.n=0},size:function(){return this.n},add:function(g){if(!g.id||this.list[g.id]){console.debug("tools-repeat::add - Duplicate repeat block id.");return}this.n++;var f=new e.ButtonIcon({icon:"fa-trash-o",tooltip:"Delete this repeat block",cls:"ui-button-icon-plain",onclick:function(){if(g.ondel){g.ondel()}}});var h=new b.View({id:g.id,title:"<b>"+g.title+"</b>",cls:"ui-portlet-repeat",operations:{button_delete:f}});h.append(g.$el);h.$el.addClass("section-row");this.list[g.id]=h;this.table.add(h.$el);this.table.append("row_"+g.id,true);if(this.options.max>0&&this.n>=this.options.max){this.button_new.disable()}this._refresh()},del:function(g){if(!this.list[g]){console.debug("tools-repeat::del - Invalid repeat block id.");return}this.n--;var f=this.table.get("row_"+g);f.remove();delete this.list[g];this.button_new.enable();this._refresh()},_refresh:function(){var f=0;for(var h in this.list){var g=this.list[h];g.title(++f+": "+this.options.title);if(this.n>this.options.min){g.showOperation("button_delete")}else{g.hideOperation("button_delete")}}}});return{View:d}}); \ No newline at end of file diff -r ade75ceb5427c588756ab888c3944cf4d25ada73 -r 394cf89ac0044524bf1f2dac6971a4d593c714ec static/scripts/packed/mvc/tools/tools-section.js --- a/static/scripts/packed/mvc/tools/tools-section.js +++ b/static/scripts/packed/mvc/tools/tools-section.js @@ -1,1 +1,1 @@ -define(["utils/utils","mvc/ui/ui-table","mvc/ui/ui-misc","mvc/ui/ui-portlet","mvc/tools/tools-repeat","mvc/tools/tools-select-content","mvc/tools/tools-input"],function(e,b,h,d,c,a,f){var g=Backbone.View.extend({initialize:function(j,i){this.app=j;this.inputs=i.inputs;i.cls="ui-table-plain";i.cls_tr="section-row";this.table=new b.View(i);this.setElement(this.table.$el);this.render()},render:function(){this.table.delAll();for(var j in this.inputs){this.add(this.inputs[j])}},add:function(k){var j=this;var i=jQuery.extend(true,{},k);i.id=k.id=e.uuid();this.app.input_list[i.id]=i;var l=i.type;switch(l){case"conditional":this._addConditional(i);break;case"repeat":this._addRepeat(i);break;case"section":this._addSection(i);break;default:this._addRow(i)}},_addConditional:function(j){var k=this;j.test_param.id=j.id;var n=this._addRow(j.test_param);n.options.onchange=function(w){var v=k.app.tree.matchCase(j,w);for(var u in j.cases){var q=j.cases[u];var t=j.id+"-section-"+u;var p=k.table.get(t);var s=false;for(var r in q.inputs){if(!q.inputs[r].hidden){s=true;break}}if(u==v&&s){p.fadeIn("fast")}else{p.hide()}}k.app.trigger("refresh")};for(var m in j.cases){var l=j.id+"-section-"+m;var o=new g(this.app,{inputs:j.cases[m].inputs});o.$el.addClass("ui-table-section");this.table.add(o.$el);this.table.append(l)}n.trigger("change")},_addRepeat:function(p){var s=this;var q=0;function n(i,u){var t=p.id+"-section-"+(q++);var v=null;if(u){v=function(){l.del(t);l.retitle(p.title);s.app.trigger("refresh")}}var w=new g(s.app,{inputs:i});l.add({id:t,title:p.title,$el:w.$el,ondel:v});l.retitle(p.title)}var l=new c.View({title_new:p.title,max:p.max,onnew:function(){n(p.inputs,true);s.app.trigger("refresh")}});var j=p.min;var r=_.size(p.cache);for(var m=0;m<Math.max(r,j);m++){var o=null;if(m<r){o=p.cache[m]}else{o=p.inputs}n(o,m>=j)}var k=new f(this.app,{label:p.title,help:p.help,field:l});this.table.add(k.$el);this.table.append(p.id)},_addSection:function(i){var j=this;var n=new g(j.app,{inputs:i.inputs});var m=new h.ButtonIcon({icon:"fa-eye-slash",tooltip:"Show/hide section",cls:"ui-button-icon-plain"});var l=new d.View({title:i.label,cls:"ui-portlet-section",operations:{button_visible:m}});l.append(n.$el);l.append($("<div/>").addClass("ui-table-form-info").html(i.help));var k=false;l.$content.hide();l.$header.css("cursor","pointer");l.$header.on("click",function(){if(k){k=false;l.$content.hide();m.setIcon("fa-eye-slash")}else{k=true;l.$content.fadeIn("fast");m.setIcon("fa-eye")}});if(i.expand){l.$header.trigger("click")}this.table.add(l.$el);this.table.append(i.id)},_addRow:function(i){var l=i.id;var j=this._createField(i);this.app.field_list[l]=j;if(i.default_value===undefined){i.default_value=i.value}var k=new f(this.app,{label:i.label,default_value:i.default_value,optional:i.optional,help:i.help,field:j});this.app.element_list[l]=k;this.table.add(k.$el);this.table.append(l);if(i.hidden){this.table.get(l).hide()}return j},_createField:function(i){var j=null;switch(i.type){case"text":j=this._fieldText(i);break;case"select":j=this._fieldSelect(i);break;case"data":j=this._fieldData(i);break;case"data_collection":j=this._fieldData(i);break;case"data_column":i.error_text="Missing columns in referenced dataset.";j=this._fieldSelect(i);break;case"hidden":j=this._fieldHidden(i);break;case"hidden_data":j=this._fieldHidden(i);break;case"integer":j=this._fieldSlider(i);break;case"float":j=this._fieldSlider(i);break;case"boolean":j=this._fieldBoolean(i);break;case"genomebuild":i.searchable=true;j=this._fieldSelect(i);break;case"drill_down":j=this._fieldDrilldown(i);break;case"baseurl":j=this._fieldHidden(i);break;default:this.app.incompatible=true;if(i.options){j=this._fieldSelect(i)}else{j=this._fieldText(i)}console.debug("tools-form::_addRow() : Auto matched field type ("+i.type+").")}if(i.value!==undefined){j.value(i.value)}return j},_fieldData:function(i){if(!this.app.options.is_dynamic){i.info="Data input '"+i.name+"' ("+e.textify(i.extensions.toString())+")";i.value=null;return this._fieldHidden(i)}var j=this;return new a.View(this.app,{id:"field-"+i.id,extensions:i.extensions,optional:i.optional,multiple:i.multiple,type:i.type,data:i.options,onchange:function(){j.app.trigger("refresh")}})},_fieldSelect:function(j){if(!this.app.options.is_dynamic&&j.is_dynamic){return this._fieldText(j)}var l=[];for(var m in j.options){var n=j.options[m];l.push({label:n[0],value:n[1]})}var o=h.Select;switch(j.display){case"checkboxes":o=h.Checkbox;break;case"radio":o=h.Radio;break}var k=this;return new o.View({id:"field-"+j.id,data:l,error_text:j.error_text||"No options available",multiple:j.multiple,searchable:j.searchable,onchange:function(){k.app.trigger("refresh")}})},_fieldDrilldown:function(i){if(!this.app.options.is_dynamic&&i.is_dynamic){return this._fieldText(i)}var j=this;return new h.Drilldown.View({id:"field-"+i.id,data:i.options,display:i.display,onchange:function(){j.app.trigger("refresh")}})},_fieldText:function(i){if(i.options){i.area=i.multiple;if(!e.validate(i.value)){i.value=""}else{if(i.value instanceof Array){i.value=value.toString()}else{i.value=String(i.value).replace(/[\[\]'"\s]/g,"");if(i.multiple){i.value=i.value.replace(/,/g,"\n")}}}}var j=this;return new h.Input({id:"field-"+i.id,area:i.area,onchange:function(){j.app.trigger("refresh")}})},_fieldSlider:function(i){var j=this;return new h.Slider.View({id:"field-"+i.id,precise:i.type=="float",min:i.min,max:i.max,onchange:function(){j.app.trigger("refresh")}})},_fieldHidden:function(i){return new h.Hidden({id:"field-"+i.id,info:i.info})},_fieldBoolean:function(i){var j=this;return new h.RadioButton.View({id:"field-"+i.id,data:[{label:"Yes",value:"true"},{label:"No",value:"false"}],onchange:function(){j.app.trigger("refresh")}})}});return{View:g}}); \ No newline at end of file +define(["utils/utils","mvc/ui/ui-table","mvc/ui/ui-misc","mvc/ui/ui-portlet","mvc/tools/tools-repeat","mvc/tools/tools-select-content","mvc/tools/tools-input"],function(e,b,h,d,c,a,f){var g=Backbone.View.extend({initialize:function(j,i){this.app=j;this.inputs=i.inputs;i.cls="ui-table-plain";i.cls_tr="section-row";this.table=new b.View(i);this.setElement(this.table.$el);this.render()},render:function(){this.table.delAll();for(var j in this.inputs){this.add(this.inputs[j])}},add:function(k){var j=this;var i=jQuery.extend(true,{},k);i.id=k.id=e.uuid();this.app.input_list[i.id]=i;var l=i.type;switch(l){case"conditional":this._addConditional(i);break;case"repeat":this._addRepeat(i);break;case"section":this._addSection(i);break;default:this._addRow(i)}},_addConditional:function(j){var k=this;j.test_param.id=j.id;var n=this._addRow(j.test_param);n.options.onchange=function(w){var v=k.app.tree.matchCase(j,w);for(var u in j.cases){var q=j.cases[u];var t=j.id+"-section-"+u;var p=k.table.get(t);var s=false;for(var r in q.inputs){if(!q.inputs[r].hidden){s=true;break}}if(u==v&&s){p.fadeIn("fast")}else{p.hide()}}k.app.trigger("refresh")};for(var m in j.cases){var l=j.id+"-section-"+m;var o=new g(this.app,{inputs:j.cases[m].inputs});o.$el.addClass("ui-table-section");this.table.add(o.$el);this.table.append(l)}n.trigger("change")},_addRepeat:function(p){var s=this;var q=0;var l=new c.View({title:p.title,title_new:p.title,min:p.min,max:p.max,onnew:function(){n(p.inputs);s.app.trigger("refresh")}});function n(i){var t=p.id+"-section-"+(q++);var u=new g(s.app,{inputs:i});l.add({id:t,$el:u.$el,ondel:function(){l.del(t);s.app.trigger("refresh")}})}var j=p.min;var r=_.size(p.cache);for(var m=0;m<Math.max(r,j);m++){var o=null;if(m<r){o=p.cache[m]}else{o=p.inputs}n(o)}var k=new f(this.app,{label:p.title,help:p.help,field:l});this.table.add(k.$el);this.table.append(p.id)},_addSection:function(i){var j=this;var n=new g(j.app,{inputs:i.inputs});var m=new h.ButtonIcon({icon:"fa-eye-slash",tooltip:"Show/hide section",cls:"ui-button-icon-plain"});var l=new d.View({title:i.label,cls:"ui-portlet-section",operations:{button_visible:m}});l.append(n.$el);l.append($("<div/>").addClass("ui-table-form-info").html(i.help));var k=false;l.$content.hide();l.$header.css("cursor","pointer");l.$header.on("click",function(){if(k){k=false;l.$content.hide();m.setIcon("fa-eye-slash")}else{k=true;l.$content.fadeIn("fast");m.setIcon("fa-eye")}});if(i.expand){l.$header.trigger("click")}this.table.add(l.$el);this.table.append(i.id)},_addRow:function(i){var l=i.id;var j=this._createField(i);this.app.field_list[l]=j;if(i.default_value===undefined){i.default_value=i.value}var k=new f(this.app,{label:i.label,default_value:i.default_value,optional:i.optional,help:i.help,field:j});this.app.element_list[l]=k;this.table.add(k.$el);this.table.append(l);if(i.hidden){this.table.get(l).hide()}return j},_createField:function(i){var j=null;switch(i.type){case"text":j=this._fieldText(i);break;case"select":j=this._fieldSelect(i);break;case"data":j=this._fieldData(i);break;case"data_collection":j=this._fieldData(i);break;case"data_column":i.error_text="Missing columns in referenced dataset.";j=this._fieldSelect(i);break;case"hidden":j=this._fieldHidden(i);break;case"hidden_data":j=this._fieldHidden(i);break;case"integer":j=this._fieldSlider(i);break;case"float":j=this._fieldSlider(i);break;case"boolean":j=this._fieldBoolean(i);break;case"genomebuild":i.searchable=true;j=this._fieldSelect(i);break;case"drill_down":j=this._fieldDrilldown(i);break;case"baseurl":j=this._fieldHidden(i);break;default:this.app.incompatible=true;if(i.options){j=this._fieldSelect(i)}else{j=this._fieldText(i)}console.debug("tools-form::_addRow() : Auto matched field type ("+i.type+").")}if(i.value!==undefined){j.value(i.value)}return j},_fieldData:function(i){if(!this.app.options.is_dynamic){i.info="Data input '"+i.name+"' ("+e.textify(i.extensions.toString())+")";i.value=null;return this._fieldHidden(i)}var j=this;return new a.View(this.app,{id:"field-"+i.id,extensions:i.extensions,optional:i.optional,multiple:i.multiple,type:i.type,data:i.options,onchange:function(){j.app.trigger("refresh")}})},_fieldSelect:function(j){if(!this.app.options.is_dynamic&&j.is_dynamic){return this._fieldText(j)}var l=[];for(var m in j.options){var n=j.options[m];l.push({label:n[0],value:n[1]})}var o=h.Select;switch(j.display){case"checkboxes":o=h.Checkbox;break;case"radio":o=h.Radio;break}var k=this;return new o.View({id:"field-"+j.id,data:l,error_text:j.error_text||"No options available",multiple:j.multiple,searchable:j.searchable,onchange:function(){k.app.trigger("refresh")}})},_fieldDrilldown:function(i){if(!this.app.options.is_dynamic&&i.is_dynamic){return this._fieldText(i)}var j=this;return new h.Drilldown.View({id:"field-"+i.id,data:i.options,display:i.display,onchange:function(){j.app.trigger("refresh")}})},_fieldText:function(i){if(i.options){i.area=i.multiple;if(!e.validate(i.value)){i.value=""}else{if(i.value instanceof Array){i.value=value.toString()}else{i.value=String(i.value).replace(/[\[\]'"\s]/g,"");if(i.multiple){i.value=i.value.replace(/,/g,"\n")}}}}var j=this;return new h.Input({id:"field-"+i.id,area:i.area,onchange:function(){j.app.trigger("refresh")}})},_fieldSlider:function(i){var j=this;return new h.Slider.View({id:"field-"+i.id,precise:i.type=="float",min:i.min,max:i.max,onchange:function(){j.app.trigger("refresh")}})},_fieldHidden:function(i){return new h.Hidden({id:"field-"+i.id,info:i.info})},_fieldBoolean:function(i){var j=this;return new h.RadioButton.View({id:"field-"+i.id,data:[{label:"Yes",value:"true"},{label:"No",value:"false"}],onchange:function(){j.app.trigger("refresh")}})}});return{View:g}}); \ No newline at end of file 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: More style adjustments
by commits-noreply＠bitbucket.org 07 Feb '15

07 Feb '15

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ade75ceb5427/ Changeset: ade75ceb5427 User: guerler Date: 2015-02-07 03:03:33+00:00 Summary: ToolForm: More style adjustments Affected #: 8 files diff -r 527b11f07d8107298c87293eb04469f2743e229e -r ade75ceb5427c588756ab888c3944cf4d25ada73 client/galaxy/scripts/mvc/tools/tools-select-content.js --- a/client/galaxy/scripts/mvc/tools/tools-select-content.js +++ b/client/galaxy/scripts/mvc/tools/tools-select-content.js @@ -48,7 +48,11 @@ // add single dataset selector if (this.mode == 'single') { - radio_buttons.push({icon: 'fa-file-o', label: '', value: 'single', tooltip: 'Single dataset' }); + radio_buttons.push({ + icon : 'fa-file-o', + value : 'single', + tooltip : 'Single dataset' + }); this.select_single = new Ui.Select.View({ optional : options.optional, error_text : hda_error, @@ -64,7 +68,11 @@ // add multiple dataset selector if (this.mode == 'single' || this.mode == 'multiple') { - radio_buttons.push({icon: 'fa-files-o', label: '', value: 'multiple', tooltip: 'Multiple datasets' }); + radio_buttons.push({ + icon : 'fa-files-o', + value : 'multiple', + tooltip : 'Multiple datasets' + }); this.select_multiple = new Ui.Select.View({ multiple : true, error_text : hda_error, @@ -80,7 +88,11 @@ // add collection selector if (this.mode == 'single' || this.mode == 'collection') { - radio_buttons.push({icon: 'fa-folder-o', label: '', value: 'collection', tooltip: 'Dataset collection' }); + radio_buttons.push({ + icon : 'fa-folder-o', + value : 'collection', + tooltip : 'Dataset collection' + }); this.select_collection = new Ui.Select.View({ error_text : hdca_error, optional : options.optional, @@ -108,13 +120,17 @@ // add batch mode information this.$batch = $(ToolTemplate.batchMode()); - // calculate button width (should be placed into css once its supported) - var button_width = (_.size(this.list) - 1) * 60 + 'px'; - - // add elements to dom - if (_.size(this.list) > 1) { + // number of radio buttons + var n_buttons = _.size(this.list); + + // add button to dom + var button_width = 0; + if (n_buttons > 1) { this.$el.append(this.button_type.$el); + button_width = Math.max(0, _.size(this.list) * 35) + 'px'; } + + // append field elements for (var i in this.list) { this.$el.append(this.list[i].field.$el.css({ 'margin-left': button_width diff -r 527b11f07d8107298c87293eb04469f2743e229e -r ade75ceb5427c588756ab888c3944cf4d25ada73 client/galaxy/scripts/mvc/ui/ui-options.js --- a/client/galaxy/scripts/mvc/ui/ui-options.js +++ b/client/galaxy/scripts/mvc/ui/ui-options.js @@ -286,12 +286,19 @@ /** Template for a single option */ _templateOption: function(pair) { + var cls = 'fa ' + pair.icon; + if (!pair.label) { + cls += ' no-padding'; + } var tmpl = '<label class="btn btn-default">'; if (pair.icon) { - tmpl += '<i class="fa ' + pair.icon + '"/>'; + tmpl += '<i class="' + cls + '"/>'; } - tmpl += '<input type="radio" name="' + this.options.id + '" value="' + pair.value + '">' + pair.label + - '</label>'; + tmpl += '<input type="radio" name="' + this.options.id + '" value="' + pair.value + '">'; + if (pair.label) { + tmpl += pair.label; + } + tmpl += '</label>'; return tmpl; }, diff -r 527b11f07d8107298c87293eb04469f2743e229e -r ade75ceb5427c588756ab888c3944cf4d25ada73 static/scripts/mvc/tools/tools-select-content.js --- a/static/scripts/mvc/tools/tools-select-content.js +++ b/static/scripts/mvc/tools/tools-select-content.js @@ -48,7 +48,11 @@ // add single dataset selector if (this.mode == 'single') { - radio_buttons.push({icon: 'fa-file-o', label: '', value: 'single', tooltip: 'Single dataset' }); + radio_buttons.push({ + icon : 'fa-file-o', + value : 'single', + tooltip : 'Single dataset' + }); this.select_single = new Ui.Select.View({ optional : options.optional, error_text : hda_error, @@ -64,7 +68,11 @@ // add multiple dataset selector if (this.mode == 'single' || this.mode == 'multiple') { - radio_buttons.push({icon: 'fa-files-o', label: '', value: 'multiple', tooltip: 'Multiple datasets' }); + radio_buttons.push({ + icon : 'fa-files-o', + value : 'multiple', + tooltip : 'Multiple datasets' + }); this.select_multiple = new Ui.Select.View({ multiple : true, error_text : hda_error, @@ -80,7 +88,11 @@ // add collection selector if (this.mode == 'single' || this.mode == 'collection') { - radio_buttons.push({icon: 'fa-folder-o', label: '', value: 'collection', tooltip: 'Dataset collection' }); + radio_buttons.push({ + icon : 'fa-folder-o', + value : 'collection', + tooltip : 'Dataset collection' + }); this.select_collection = new Ui.Select.View({ error_text : hdca_error, optional : options.optional, @@ -108,13 +120,17 @@ // add batch mode information this.$batch = $(ToolTemplate.batchMode()); - // calculate button width (should be placed into css once its supported) - var button_width = (_.size(this.list) - 1) * 60 + 'px'; - - // add elements to dom - if (_.size(this.list) > 1) { + // number of radio buttons + var n_buttons = _.size(this.list); + + // add button to dom + var button_width = 0; + if (n_buttons > 1) { this.$el.append(this.button_type.$el); + button_width = Math.max(0, _.size(this.list) * 35) + 'px'; } + + // append field elements for (var i in this.list) { this.$el.append(this.list[i].field.$el.css({ 'margin-left': button_width diff -r 527b11f07d8107298c87293eb04469f2743e229e -r ade75ceb5427c588756ab888c3944cf4d25ada73 static/scripts/mvc/ui/ui-options.js --- a/static/scripts/mvc/ui/ui-options.js +++ b/static/scripts/mvc/ui/ui-options.js @@ -286,12 +286,19 @@ /** Template for a single option */ _templateOption: function(pair) { + var cls = 'fa ' + pair.icon; + if (!pair.label) { + cls += ' no-padding'; + } var tmpl = '<label class="btn btn-default">'; if (pair.icon) { - tmpl += '<i class="fa ' + pair.icon + '"/>'; + tmpl += '<i class="' + cls + '"/>'; } - tmpl += '<input type="radio" name="' + this.options.id + '" value="' + pair.value + '">' + pair.label + - '</label>'; + tmpl += '<input type="radio" name="' + this.options.id + '" value="' + pair.value + '">'; + if (pair.label) { + tmpl += pair.label; + } + tmpl += '</label>'; return tmpl; }, diff -r 527b11f07d8107298c87293eb04469f2743e229e -r ade75ceb5427c588756ab888c3944cf4d25ada73 static/scripts/packed/mvc/tools/tools-select-content.js --- a/static/scripts/packed/mvc/tools/tools-select-content.js +++ b/static/scripts/packed/mvc/tools/tools-select-content.js @@ -1,1 +1,1 @@ -define(["utils/utils","mvc/ui/ui-misc","mvc/ui/ui-tabs","mvc/tools/tools-template"],function(c,e,b,a){var d=Backbone.View.extend({initialize:function(f,o){this.app=f;this.options=o;var n=this;this.setElement('<div class="ui-select-content"/>');this.list={};var l=[];if(o.type=="data_collection"){this.mode="collection"}else{if(o.multiple){this.mode="multiple"}else{this.mode="single"}}this.current=this.mode;this.list={};var j=c.textify(o.extensions);var h="No dataset available.";if(j){h="No "+j+" dataset available."}var k="No dataset list available.";if(j){k="No "+j+" dataset collection available."}if(this.mode=="single"){l.push({icon:"fa-file-o",label:"",value:"single",tooltip:"Single dataset"});this.select_single=new e.Select.View({optional:o.optional,error_text:h,onchange:function(){n.trigger("change")}});this.list.single={field:this.select_single,type:"hda"}}if(this.mode=="single"||this.mode=="multiple"){l.push({icon:"fa-files-o",label:"",value:"multiple",tooltip:"Multiple datasets"});this.select_multiple=new e.Select.View({multiple:true,error_text:h,onchange:function(){n.trigger("change")}});this.list.multiple={field:this.select_multiple,type:"hda"}}if(this.mode=="single"||this.mode=="collection"){l.push({icon:"fa-folder-o",label:"",value:"collection",tooltip:"Dataset collection"});this.select_collection=new e.Select.View({error_text:k,optional:o.optional,onchange:function(){n.trigger("change")}});this.list.collection={field:this.select_collection,type:"hdca"}}this.button_type=new e.RadioButton.View({value:this.current,data:l,onchange:function(i){n.current=i;n.refresh();n.trigger("change")}});this.$batch=$(a.batchMode());var m=(_.size(this.list)-1)*60+"px";if(_.size(this.list)>1){this.$el.append(this.button_type.$el)}for(var g in this.list){this.$el.append(this.list[g].field.$el.css({"margin-left":m}))}this.$el.append(this.$batch.css({"margin-left":m}));this.update(o.data);if(this.options.value!==undefined){this.value(this.options.value)}this.refresh();this.on("change",function(){if(o.onchange){o.onchange(n.value())}})},wait:function(){for(var f in this.list){this.list[f].field.wait()}},unwait:function(){for(var f in this.list){this.list[f].field.unwait()}},update:function(g){var l=[];for(var j in g.hda){var k=g.hda[j];l.push({label:k.hid+": "+k.name,value:k.id})}var f=[];for(var j in g.hdca){var h=g.hdca[j];f.push({label:h.hid+": "+h.name,value:h.id})}this.select_single&&this.select_single.update(l);this.select_multiple&&this.select_multiple.update(l);this.select_collection&&this.select_collection.update(f);this.app.content.add(g)},value:function(h){if(h!==undefined){if(h&&h.values){try{var l=[];for(var g in h.values){l.push(h.values[g].id)}if(h&&h.values.length>0&&h.values[0].src=="hcda"){this.current="collection";this.select_collection.value(l[0])}else{if(this.mode=="multiple"){this.current="multiple";this.select_multiple.value(l)}else{this.current="single";this.select_single.value(l[0])}}}catch(k){console.debug("tools-select-content::value() - Skipped.")}}else{this.select_single&&this.select_single.value("__null__");this.select_multiple&&this.select_multiple.value("__null__");this.select_collection&&this.select_collection.value("__null__")}this.refresh()}var j=this._select().value();if(!(j instanceof Array)){j=[j]}var f={batch:this.mode=="single"&&this.current!="single",values:[]};for(var g in j){f.values.push({id:j[g],src:this.list[this.current].type})}return f},validate:function(){return this._select().validate()},refresh:function(){this.button_type.value(this.current);for(var g in this.list){var f=this.list[g].field.$el;if(this.current==g){f.show()}else{f.hide()}}if(this.mode=="single"&&this.current!="single"){this.$batch.show()}else{this.$batch.hide()}},_select:function(){return this.list[this.current].field}});return{View:d}}); \ No newline at end of file +define(["utils/utils","mvc/ui/ui-misc","mvc/ui/ui-tabs","mvc/tools/tools-template"],function(c,e,b,a){var d=Backbone.View.extend({initialize:function(g,p){this.app=g;this.options=p;var o=this;this.setElement('<div class="ui-select-content"/>');this.list={};var m=[];if(p.type=="data_collection"){this.mode="collection"}else{if(p.multiple){this.mode="multiple"}else{this.mode="single"}}this.current=this.mode;this.list={};var k=c.textify(p.extensions);var j="No dataset available.";if(k){j="No "+k+" dataset available."}var l="No dataset list available.";if(k){l="No "+k+" dataset collection available."}if(this.mode=="single"){m.push({icon:"fa-file-o",value:"single",tooltip:"Single dataset"});this.select_single=new e.Select.View({optional:p.optional,error_text:j,onchange:function(){o.trigger("change")}});this.list.single={field:this.select_single,type:"hda"}}if(this.mode=="single"||this.mode=="multiple"){m.push({icon:"fa-files-o",value:"multiple",tooltip:"Multiple datasets"});this.select_multiple=new e.Select.View({multiple:true,error_text:j,onchange:function(){o.trigger("change")}});this.list.multiple={field:this.select_multiple,type:"hda"}}if(this.mode=="single"||this.mode=="collection"){m.push({icon:"fa-folder-o",value:"collection",tooltip:"Dataset collection"});this.select_collection=new e.Select.View({error_text:l,optional:p.optional,onchange:function(){o.trigger("change")}});this.list.collection={field:this.select_collection,type:"hdca"}}this.button_type=new e.RadioButton.View({value:this.current,data:m,onchange:function(i){o.current=i;o.refresh();o.trigger("change")}});this.$batch=$(a.batchMode());var f=_.size(this.list);var n=0;if(f>1){this.$el.append(this.button_type.$el);n=Math.max(0,_.size(this.list)*35)+"px"}for(var h in this.list){this.$el.append(this.list[h].field.$el.css({"margin-left":n}))}this.$el.append(this.$batch.css({"margin-left":n}));this.update(p.data);if(this.options.value!==undefined){this.value(this.options.value)}this.refresh();this.on("change",function(){if(p.onchange){p.onchange(o.value())}})},wait:function(){for(var f in this.list){this.list[f].field.wait()}},unwait:function(){for(var f in this.list){this.list[f].field.unwait()}},update:function(g){var l=[];for(var j in g.hda){var k=g.hda[j];l.push({label:k.hid+": "+k.name,value:k.id})}var f=[];for(var j in g.hdca){var h=g.hdca[j];f.push({label:h.hid+": "+h.name,value:h.id})}this.select_single&&this.select_single.update(l);this.select_multiple&&this.select_multiple.update(l);this.select_collection&&this.select_collection.update(f);this.app.content.add(g)},value:function(h){if(h!==undefined){if(h&&h.values){try{var l=[];for(var g in h.values){l.push(h.values[g].id)}if(h&&h.values.length>0&&h.values[0].src=="hcda"){this.current="collection";this.select_collection.value(l[0])}else{if(this.mode=="multiple"){this.current="multiple";this.select_multiple.value(l)}else{this.current="single";this.select_single.value(l[0])}}}catch(k){console.debug("tools-select-content::value() - Skipped.")}}else{this.select_single&&this.select_single.value("__null__");this.select_multiple&&this.select_multiple.value("__null__");this.select_collection&&this.select_collection.value("__null__")}this.refresh()}var j=this._select().value();if(!(j instanceof Array)){j=[j]}var f={batch:this.mode=="single"&&this.current!="single",values:[]};for(var g in j){f.values.push({id:j[g],src:this.list[this.current].type})}return f},validate:function(){return this._select().validate()},refresh:function(){this.button_type.value(this.current);for(var g in this.list){var f=this.list[g].field.$el;if(this.current==g){f.show()}else{f.hide()}}if(this.mode=="single"&&this.current!="single"){this.$batch.show()}else{this.$batch.hide()}},_select:function(){return this.list[this.current].field}});return{View:d}}); \ No newline at end of file diff -r 527b11f07d8107298c87293eb04469f2743e229e -r ade75ceb5427c588756ab888c3944cf4d25ada73 static/scripts/packed/mvc/ui/ui-options.js --- a/static/scripts/packed/mvc/ui/ui-options.js +++ b/static/scripts/packed/mvc/ui/ui-options.js @@ -1,1 +1,1 @@ -define(["utils/utils"],function(b){var a=Backbone.View.extend({initialize:function(g){this.optionsDefault={visible:true,data:[],id:b.uuid(),error_text:"No data available.",wait_text:"Please wait..."};this.options=b.merge(g,this.optionsDefault);this.setElement('<div class="ui-options"/>');this.$message=$("<div/>");this.$options=$(this._template(g));this.$el.append(this.$message);this.$el.append(this.$options);if(!this.options.visible){this.$el.hide()}this.update(this.options.data);if(this.options.value!==undefined){this.value(this.options.value)}var f=this;this.on("change",function(){f._change()})},update:function(g){var j=this._getValue();this.$options.empty();if(this._templateOptions){this.$options.append(this._templateOptions(g))}else{for(var h in g){var i=$(this._templateOption(g[h]));i.addClass("ui-option");i.tooltip({title:g[h].tooltip,placement:"bottom"});this.$options.append(i)}}var f=this;this.$el.find("input").on("change",function(){f.value(f._getValue());f._change()});this._refresh();this.value(j)},value:function(g){if(g!==undefined){if(!(g instanceof Array)){g=[g]}this.$el.find("input").prop("checked",false);for(var f in g){this.$el.find('input[value="'+g[f]+'"]').first().prop("checked",true)}}return this._getValue()},exists:function(g){if(g!==undefined){if(!(g instanceof Array)){g=[g]}for(var f in g){if(this.$el.find('input[value="'+g[f]+'"]').length>0){return true}}}return false},first:function(){var f=this.$el.find("input");if(f.length>0){return f.val()}else{return undefined}},validate:function(){return b.validate(this.value())},wait:function(){if(this._size()==0){this._messageShow(this.options.wait_text,"info");this.$options.hide()}},unwait:function(){this._messageHide();this._refresh()},_change:function(){if(this.options.onchange){this.options.onchange(this._getValue())}},_refresh:function(){if(this._size()==0){this._messageShow(this.options.error_text,"danger");this.$options.hide()}else{this._messageHide();this.$options.css("display","inline-block")}},_getValue:function(){var g=this.$el.find(":checked");if(g.length==0){return"__null__"}if(this.options.multiple){var f=[];g.each(function(){f.push($(this).val())});return f}else{return g.val()}},_size:function(){return this.$el.find(".ui-option").length},_messageShow:function(g,f){this.$message.show();this.$message.removeClass();this.$message.addClass("ui-message alert alert-"+f);this.$message.html(g)},_messageHide:function(){this.$message.hide()},_template:function(){return'<div class="ui-options-input"/>'}});var d={};d.View=a.extend({initialize:function(f){a.prototype.initialize.call(this,f)},_templateOption:function(f){return'<div><input type="radio" name="'+this.options.id+'" value="'+f.value+'"/>'+f.label+"<br></div>"}});var c={};c.View=a.extend({initialize:function(f){f.multiple=true;a.prototype.initialize.call(this,f)},_templateOption:function(f){return'<div><input type="checkbox" name="'+this.options.id+'" value="'+f.value+'"/>'+f.label+"<br></div>"}});var e={};e.View=a.extend({initialize:function(f){a.prototype.initialize.call(this,f)},value:function(f){if(f!==undefined){this.$el.find("input").prop("checked",false);this.$el.find("label").removeClass("active");this.$el.find('[value="'+f+'"]').prop("checked",true).closest("label").addClass("active")}return this._getValue()},_templateOption:function(g){var f='<label class="btn btn-default">';if(g.icon){f+='<i class="fa '+g.icon+'"/>'}f+='<input type="radio" name="'+this.options.id+'" value="'+g.value+'">'+g.label+"</label>";return f},_template:function(){return'<div class="btn-group ui-radiobutton" data-toggle="buttons"/>'}});return{Base:a,Radio:d,RadioButton:e,Checkbox:c}}); \ No newline at end of file +define(["utils/utils"],function(b){var a=Backbone.View.extend({initialize:function(g){this.optionsDefault={visible:true,data:[],id:b.uuid(),error_text:"No data available.",wait_text:"Please wait..."};this.options=b.merge(g,this.optionsDefault);this.setElement('<div class="ui-options"/>');this.$message=$("<div/>");this.$options=$(this._template(g));this.$el.append(this.$message);this.$el.append(this.$options);if(!this.options.visible){this.$el.hide()}this.update(this.options.data);if(this.options.value!==undefined){this.value(this.options.value)}var f=this;this.on("change",function(){f._change()})},update:function(g){var j=this._getValue();this.$options.empty();if(this._templateOptions){this.$options.append(this._templateOptions(g))}else{for(var h in g){var i=$(this._templateOption(g[h]));i.addClass("ui-option");i.tooltip({title:g[h].tooltip,placement:"bottom"});this.$options.append(i)}}var f=this;this.$el.find("input").on("change",function(){f.value(f._getValue());f._change()});this._refresh();this.value(j)},value:function(g){if(g!==undefined){if(!(g instanceof Array)){g=[g]}this.$el.find("input").prop("checked",false);for(var f in g){this.$el.find('input[value="'+g[f]+'"]').first().prop("checked",true)}}return this._getValue()},exists:function(g){if(g!==undefined){if(!(g instanceof Array)){g=[g]}for(var f in g){if(this.$el.find('input[value="'+g[f]+'"]').length>0){return true}}}return false},first:function(){var f=this.$el.find("input");if(f.length>0){return f.val()}else{return undefined}},validate:function(){return b.validate(this.value())},wait:function(){if(this._size()==0){this._messageShow(this.options.wait_text,"info");this.$options.hide()}},unwait:function(){this._messageHide();this._refresh()},_change:function(){if(this.options.onchange){this.options.onchange(this._getValue())}},_refresh:function(){if(this._size()==0){this._messageShow(this.options.error_text,"danger");this.$options.hide()}else{this._messageHide();this.$options.css("display","inline-block")}},_getValue:function(){var g=this.$el.find(":checked");if(g.length==0){return"__null__"}if(this.options.multiple){var f=[];g.each(function(){f.push($(this).val())});return f}else{return g.val()}},_size:function(){return this.$el.find(".ui-option").length},_messageShow:function(g,f){this.$message.show();this.$message.removeClass();this.$message.addClass("ui-message alert alert-"+f);this.$message.html(g)},_messageHide:function(){this.$message.hide()},_template:function(){return'<div class="ui-options-input"/>'}});var d={};d.View=a.extend({initialize:function(f){a.prototype.initialize.call(this,f)},_templateOption:function(f){return'<div><input type="radio" name="'+this.options.id+'" value="'+f.value+'"/>'+f.label+"<br></div>"}});var c={};c.View=a.extend({initialize:function(f){f.multiple=true;a.prototype.initialize.call(this,f)},_templateOption:function(f){return'<div><input type="checkbox" name="'+this.options.id+'" value="'+f.value+'"/>'+f.label+"<br></div>"}});var e={};e.View=a.extend({initialize:function(f){a.prototype.initialize.call(this,f)},value:function(f){if(f!==undefined){this.$el.find("input").prop("checked",false);this.$el.find("label").removeClass("active");this.$el.find('[value="'+f+'"]').prop("checked",true).closest("label").addClass("active")}return this._getValue()},_templateOption:function(h){var f="fa "+h.icon;if(!h.label){f+=" no-padding"}var g='<label class="btn btn-default">';if(h.icon){g+='<i class="'+f+'"/>'}g+='<input type="radio" name="'+this.options.id+'" value="'+h.value+'">';if(h.label){g+=h.label}g+="</label>";return g},_template:function(){return'<div class="btn-group ui-radiobutton" data-toggle="buttons"/>'}});return{Base:a,Radio:d,RadioButton:e,Checkbox:c}}); \ No newline at end of file diff -r 527b11f07d8107298c87293eb04469f2743e229e -r ade75ceb5427c588756ab888c3944cf4d25ada73 static/style/blue/base.css --- a/static/style/blue/base.css +++ b/static/style/blue/base.css @@ -1396,6 +1396,7 @@ .upload-header .select2-choice{max-height:20px;line-height:18px;background:transparent;text-align:center;font-weight:normal}.upload-header .select2-choice .select2-arrow b{background-position:0 -3px} .upload-top{height:5%;text-align:center}.upload-top .upload-info{margin-top:0px;font-weight:normal;text-align:center} .no-highlight,.ui-button-icon,.ui-portlet,.ui-portlet-repeat,.ui-portlet-limited,.ui-portlet-section,.ui-portlet-narrow{-webkit-user-select:none;-moz-user-select:none;-khtml-user-select:none;-ms-user-select:none;} +.no-padding{padding:0px !important} .ui-margin-top{padding-top:5px !important} .ui-margin-bottom{margin-bottom:5px !important} .ui-error{-moz-border-radius:3px;border-radius:3px;background:#f9c7c5;padding:5px} diff -r 527b11f07d8107298c87293eb04469f2743e229e -r ade75ceb5427c588756ab888c3944cf4d25ada73 static/style/src/less/ui.less --- a/static/style/src/less/ui.less +++ b/static/style/src/less/ui.less @@ -6,6 +6,11 @@ -ms-user-select: none; /* IE10+ */ } +// remove padding +.no-padding { + padding: 0px !important; +} + // default margins @ui-margin-vertical: 5px; @ui-margin-horizontal: 5px; 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: Merged in JenCabral/galaxy-central/tool_shed_test_fix-DB_initialization (pull request #662)
by commits-noreply＠bitbucket.org 07 Feb '15

07 Feb '15

1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/527b11f07d81/ Changeset: 527b11f07d81 User: jmchilton Date: 2015-02-07 02:33:49+00:00 Summary: Merged in JenCabral/galaxy-central/tool_shed_test_fix-DB_initialization (pull request #662) Fix tool shed tests - create database directory Affected #: 2 files diff -r 3dd2ec31034db4febf1954c295b81604cca62169 -r 527b11f07d8107298c87293eb04469f2743e229e test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py @@ -407,6 +407,9 @@ else: tempdir = tempfile.mkdtemp( dir=galaxy_test_tmp_dir ) galaxy_db_path = os.path.join( tempdir, 'database' ) + # Checks if galaxy_db_path exists, if not create it. + if not os.path.exists(galaxy_db_path): + os.makedirs(galaxy_db_path) # Configure the paths Galaxy needs to install and test tools. galaxy_file_path = os.path.join( galaxy_db_path, 'files' ) galaxy_tempfiles = tempfile.mkdtemp( dir=galaxy_test_tmp_dir ) diff -r 3dd2ec31034db4febf1954c295b81604cca62169 -r 527b11f07d8107298c87293eb04469f2743e229e test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py @@ -255,6 +255,9 @@ else: tempdir = tempfile.mkdtemp( dir=galaxy_test_tmp_dir ) galaxy_db_path = os.path.join( tempdir, 'database' ) + # Checks that galaxy_db_path exists and if not, create it. + if not os.path.exists(galaxy_db_path): + os.makedirs(galaxy_db_path) # Configure the paths Galaxy needs to install and test tools. galaxy_file_path = os.path.join( galaxy_db_path, 'files' ) galaxy_tempfiles = tempfile.mkdtemp( dir=galaxy_test_tmp_dir ) 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