From 9590d4551439c7b9ae13f704508bfef376ff1fc4 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 10 Feb 2017 23:48:05 -0500 Subject: [PATCH] Improve success message upon tool xml reloading --- client/galaxy/scripts/mvc/tool/tool-form-base.js | 2 +- static/scripts/bundled/analysis.bundled.js | 2 +- static/scripts/bundled/analysis.bundled.js.map | 2 +- static/scripts/bundled/libs.bundled.js.map | 2 +- static/scripts/mvc/tool/tool-form-base.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/galaxy/scripts/mvc/tool/tool-form-base.js b/client/galaxy/scripts/mvc/tool/tool-form-base.js index 3009fd311f8..025cff2092a 100644 --- a/client/galaxy/scripts/mvc/tool/tool-form-base.js +++ b/client/galaxy/scripts/mvc/tool/tool-form-base.js @@ -208,7 +208,7 @@ define( [ 'utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view Utils.get({ url : Galaxy.root + 'api/tools/' + options.id + '/reload', success : function( response ) { - self.message.update( { persistent : false, message : 'Tool successfully reloaded.', status : 'success' } ); + self.message.update( { persistent : false, message : 'Tool XML has been reloaded.', status : 'success' } ); }, error : function( response ) { self.message.update( { persistent : false, message : response.err_msg, status : 'danger' } ); diff --git a/static/scripts/bundled/analysis.bundled.js b/static/scripts/bundled/analysis.bundled.js index c16da6943db..ac372c8367d 100644 --- a/static/scripts/bundled/analysis.bundled.js +++ b/static/scripts/bundled/analysis.bundled.js @@ -2,7 +2,7 @@ webpackJsonp([3,1],[function(e,t,i){(function(e,t){var n=i(1),s=n,o=i(57).Galaxy urlRoot:Galaxy.root+"api/webhooks/tool"})}parent.Galaxy&&parent.Galaxy.currHistoryPanel&&parent.Galaxy.currHistoryPanel.refreshContents()},error:function(e){i&&i(),Galaxy.emit.debug("tool-form::submit","Submission failed.",e);var t=!1;if(e&&e.err_data){var s=n.form.data.matchResponse(e.err_data);for(var a in s){n.form.highlight(a,s[a]),t=!0;break}}t||n.modal.show({title:"Job submission failed",body:n._templateError(o,e&&e.err_msg),buttons:{Close:function(){n.modal.hide()}}})}})},validate:function(e){var t=e.inputs,i=-1,n=null;for(var s in t){var o=t[s],a=this.form.data.match(s),r=this.form.field_list[a],l=this.form.input_list[a];if(a&&l&&r){if(!l.optional&&null==o)return this.form.highlight(a),!1;if(o&&o.batch){var c=o.values.length,d=c>0&&o.values[0]&&o.values[0].src;if(d)if(null===n)n=d;else if(n!==d)return this.form.highlight(a,"Please select either dataset or dataset list fields for all batch mode fields."),!1;if(i===-1)i=c;else if(i!==c)return this.form.highlight(a,"Please make sure that you select the same number of inputs for all batch mode fields. This field contains "+c+" selection(s) while a previous field contains "+i+"."),!1}}else Galaxy.emit.debug("tool-form::validate()","Retrieving input objects failed.")}return!0},_templateSuccess:function(e){if(e.jobs&&e.jobs.length>0){var t=e.jobs.length,i=1==t?"1 job has":t+" jobs have",n=a("
").addClass("donemessagelarge").append(a("

").text(i+" been successfully added to the queue - resulting in the following datasets:"));return r.each(e.outputs,function(e){n.append(a("

").addClass("messagerow").append(a("").text(e.hid+": "+e.name)))}),n.append(a("

").append("").text("You can check the status of queued jobs and view the resulting data by refreshing the History pane. When the job has been run the status will change from 'running' to 'finished' if completed successfully or 'error' if problems were encountered.")),n}return this._templateError(e,"Invalid success response. No jobs found.")},_templateError:function(e,t){return a("

").addClass("errormessagelarge").append(a("

").text("The server could not complete the request. Please contact the Galaxy Team if this error persists. "+(t||""))).append(a("

").text(JSON.stringify(e,null,4)))}});return{View:l}}.apply(t,n),!(void 0!==s&&(e.exports=s))}).call(t,i(3),i(1),i(2))},function(e,t,i){var n,s;(function(o,a){n=[i(4),i(9),i(7)],s=function(e,t,i){var n=o.View.extend({initialize:function(e){var n=this;this.options=e,this.name=e.name||"element",this.multiple=e.multiple||!1,this.message=new i.Message,this.portlet=new t.View({cls:"ui-portlet-section"}),this.select=new i.Select.View({optional:e.optional}),this.button=new i.ButtonIcon({icon:"fa fa-sign-in",floating:"left",tooltip:"Insert new "+this.name,onclick:function(){n.add({id:n.select.value(),name:n.select.text()})}}),this.setElement(this._template(e)),this.$(".ui-list-message").append(this.message.$el),this.$(".ui-list-portlet").append(this.portlet.$el),this.$(".ui-list-button").append(this.button.$el),this.$(".ui-list-select").append(this.select.$el)},value:function(e){if(void 0!==e){if(this.portlet.empty(),a.isArray(e))for(var t in e){var i=e[t],n=null,s=null;"string"!=a.type(i)?(n=i.id,s=i.name):n=s=i,null!=n&&this.add({id:n,name:s})}this._refresh()}var o=[];return this.$(".ui-list-id").each(function(){o.push({id:a(this).prop("id"),name:a(this).find(".ui-list-name").html()})}),0==o.length?null:o},add:function(t){var i=this;if(0===this.$('[id="'+t.id+'"]').length)if(e.isEmpty(t.id))this.message.update({message:"Please select a valid "+this.name+".",status:"danger"});else{var n=a(this._templateRow({id:t.id,name:t.name}));n.on("click",function(){n.remove(),i._refresh()}),n.on("mouseover",function(){n.addClass("portlet-highlight")}),n.on("mouseout",function(){n.removeClass("portlet-highlight")}),this.portlet.append(n),this._refresh()}else this.message.update({message:"This "+this.name+" is already in the list."})},update:function(e){this.select.update(e)},_refresh:function(){this.$(".ui-list-id").length>0?(!this.multiple&&this.button.disable(),this.$(".ui-list-portlet").show()):(this.button.enable(),this.$(".ui-list-portlet").hide()),this.options.onchange&&this.options.onchange()},_template:function(e){return'
'},_templateRow:function(e){return'
'+e.name+"
"}});return{View:n}}.apply(t,n),!(void 0!==s&&(e.exports=s))}).call(t,i(3),i(1))},function(e,t,i){var n,s;(function(o,a,r){n=[i(4),i(13)],s=function(e,t){var i=o.View.extend({initialize:function(t){var i=this;this.model=t&&t.model||new o.Model({visible:!0,data:[],id:e.uid(),error_text:"No options available.",wait_text:"Please wait...",multiple:!1,optional:!1,onchange:function(){}}).set(t),this.listenTo(this.model,"change:value",this._changeValue,this),this.listenTo(this.model,"change:wait",this._changeWait,this),this.listenTo(this.model,"change:data",this._changeData,this),this.listenTo(this.model,"change:visible",this._changeVisible,this),this.on("change",function(){i.model.get("onchange")(i.value())}),this.render()},render:function(){var e=this;this.$el.empty().removeClass().addClass("ui-options").append(this.$message=a("
")).append(this.$menu=a("
").addClass("ui-options-menu")).append(this.$options=a(this._template())),this.all_button=null,this.model.get("multiple")&&(this.all_button=new t.ButtonCheck({onclick:function(){e.$("input").prop("checked",0!==e.all_button.value()),e.value(e._getValue()),e.trigger("change")}}),this.$menu.append(this.all_button.$el)),this._changeData(),this._changeWait(),this._changeVisible()},_changeData:function(){var e=this;this.$options.empty(),this._templateOptions?this.$options.append(this._templateOptions(this.model.get("data"))):r.each(this.model.get("data"),function(t){e.$options.append(a(e._templateOption(t)).addClass("ui-option").tooltip({title:t.tooltip,placement:"bottom"}))});var e=this;this.$("input").on("change",function(){e.value(e._getValue()),e.trigger("change")}),this._changeValue(),this._changeWait()},_changeVisible:function(){this.$el[this.model.get("visible")?"show":"hide"]()},_changeWait:function(){this.model.get("wait")?0===this.length()&&(this._messageShow(this.model.get("wait_text"),"info"),this.$options.hide(),this.$menu.hide()):0===this.length()?(this._messageShow(this.model.get("error_text"),"danger"),this.$options.hide(),this.$menu.hide()):(this.$message.hide(),this.$options.css("display","inline-block"),this.$menu.show())},_changeValue:function(){this._setValue(this.model.get("value")),null!==this._getValue()||this.model.get("multiple")||this.model.get("optional")||this._setValue(this.first()),this.all_button&&this.all_button.value(a.isArray(this._getValue())?this._getValue().length:0,this.length())},value:function(e){return void 0!==e&&this.model.set("value",e),this._getValue()},first:function(){var e=this.$("input").first();return e.length>0?e.val():null},wait:function(){this.model.set("wait",!0)},unwait:function(){this.model.set("wait",!1)},length:function(){return this.$(".ui-option").length},_setValue:function(e){var t=this;if(void 0!==e&&(this.$("input").prop("checked",!1),null!==e)){var i=a.isArray(e)?e:[e];r.each(i,function(e){t.$('input[value="'+e+'"]').first().prop("checked",!0)})}},_getValue:function(){var t=[];return this.$(":checked").each(function(){t.push(a(this).val())}),e.isEmpty(t)?null:this.model.get("multiple")?t:t[0]},_messageShow:function(e,t){this.$message.show().removeClass().addClass("ui-message alert alert-"+t).html(e)},_template:function(){return a("
").addClass("ui-options-list")}}),n=i.extend({_templateOption:function(t){var i=e.uid();return a("
").addClass("ui-option").append(a("").attr({id:i,type:this.model.get("type"),name:this.model.id,value:t.value})).append(a("