From cb23e010d7750b533be7690e72c92500ddc8e2f1 Mon Sep 17 00:00:00 2001 From: carlfeberhard Date: Thu, 10 Dec 2015 13:52:43 -0500 Subject: [PATCH] UI, History: use copy dialog in history/view for import, minor fixes --- .../galaxy/scripts/mvc/history/copy-dialog.js | 6 +-- static/maps/mvc/history/copy-dialog.js.map | 2 +- static/scripts/bundled/analysis.bundled.js | 2 +- .../scripts/bundled/analysis.bundled.js.map | 2 +- static/scripts/bundled/libs.bundled.js.map | 2 +- static/scripts/mvc/history/copy-dialog.js | 2 +- templates/webapps/galaxy/history/display.mako | 2 +- templates/webapps/galaxy/history/view.mako | 47 ++++++++----------- 8 files changed, 29 insertions(+), 36 deletions(-) diff --git a/client/galaxy/scripts/mvc/history/copy-dialog.js b/client/galaxy/scripts/mvc/history/copy-dialog.js index ba80c5239c5..ca9354ee6f2 100644 --- a/client/galaxy/scripts/mvc/history/copy-dialog.js +++ b/client/galaxy/scripts/mvc/history/copy-dialog.js @@ -155,7 +155,7 @@ var CopyDialog = { * Subclass CopyDialog to use the import language. */ var ImportDialog = _.extend( {}, CopyDialog, { - defaultName : _.template( "imported: '<%- name %>" ), + defaultName : _.template( "imported: <%- name %>" ), title : _.template( _l( 'Importing history' ) + ' "<%- name %>"' ), submitLabel : _l( 'Import' ), errorMessage : _l( 'History could not be imported' ), @@ -178,7 +178,7 @@ var ImportDialog = _.extend( {}, CopyDialog, { * (this object is also passed to the modal used to display the dialog and accepts modal options) * {Function} nameFn if defined, use this to build the default name shown to the user * (the fn is passed: {name: }) - * {bool} import if true, use the 'import' language (instead of Copy) + * {bool} useImport if true, use the 'import' language (instead of Copy) * {bool} allowAll if true, allow the user to choose between copying all datasets and * only non-deleted datasets * {String} allDatasets default initial checked radio button: 'copy-all' or 'copy-non-deleted', @@ -187,7 +187,7 @@ var historyCopyDialog = function( history, options ){ options = options || {}; // create our own modal if Galaxy doesn't have one (mako tab without use_panels) var modal = window.parent.Galaxy.modal || new MODAL.View({}); - return options.import? + return options.useImport? ImportDialog.dialog( modal, history, options ): CopyDialog.dialog( modal, history, options ); }; diff --git a/static/maps/mvc/history/copy-dialog.js.map b/static/maps/mvc/history/copy-dialog.js.map index fb6a5afbf18..69ab4121769 100644 --- a/static/maps/mvc/history/copy-dialog.js.map +++ b/static/maps/mvc/history/copy-dialog.js.map @@ -1 +1 @@ -{"version":3,"file":"copy-dialog.js","sources":["../../../src/mvc/history/copy-dialog.js"],"names":["define","MODAL","_l","CopyDialog","defaultName","_","template","title","submitLabel","errorMessage","progressive","activeLabel","allLabel","anonWarning","_template","join","_showAjaxIndicator","indicator","this","modal","$","empty","append","css","margin-top","dialog","history","options","checkNameAndCopy","name","val","show","copyAllDatasets","prop","copy","done","response","deferred","resolve","fail","alert","rejectWith","arguments","always","hide","jQuery","Deferred","defaultCopyNameFn","nameFn","defaultCopyName","get","defaultCopyWhat","allDatasets","allowAll","isUndefined","originalClosingCallback","closing_callback","extend","body","isAnon","Galaxy","user","isAnonymous","copyWhat","buttons","object","height","closing_events","cancelled","reject","focus","select","on","ev","keyCode","preventDefault","ImportDialog","historyCopyDialog","window","parent","View","import"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"copy-dialog.js","sources":["../../../src/mvc/history/copy-dialog.js"],"names":["define","MODAL","_l","CopyDialog","defaultName","_","template","title","submitLabel","errorMessage","progressive","activeLabel","allLabel","anonWarning","_template","join","_showAjaxIndicator","indicator","this","modal","$","empty","append","css","margin-top","dialog","history","options","checkNameAndCopy","name","val","show","copyAllDatasets","prop","copy","done","response","deferred","resolve","fail","alert","rejectWith","arguments","always","hide","jQuery","Deferred","defaultCopyNameFn","nameFn","defaultCopyName","get","defaultCopyWhat","allDatasets","allowAll","isUndefined","originalClosingCallback","closing_callback","extend","body","isAnon","Galaxy","user","isAnonymous","copyWhat","buttons","object","height","closing_events","cancelled","reject","focus","select","on","ev","keyCode","preventDefault","ImportDialog","historyCopyDialog","window","parent","View","useImport"],"mappings":"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"} \ No newline at end of file diff --git a/static/scripts/bundled/analysis.bundled.js b/static/scripts/bundled/analysis.bundled.js index d832f79f7a7..a9629c85e66 100644 --- a/static/scripts/bundled/analysis.bundled.js +++ b/static/scripts/bundled/analysis.bundled.js @@ -6,7 +6,7 @@ this.model.on("change",function(t,e){this.model.changedAttributes().state&&this. t.type=t.display||"checkbox",t.multiple="checkbox"==t.display,e.BaseIcons.prototype.initialize.call(this,t),this.initial=!0},value:function(t){var i=e.BaseIcons.prototype.value.call(this,t);if(this.initial&&null!==i&&this.header_index){this.initial=!1;var n=i;a.isArray(n)||(n=[n]);for(var s in n){var o=this.header_index[n[s]];for(var r in o)this._setState(o[r],!0)}}return i},_setState:function(t,e){var i=this.$(".button-"+t),n=this.$(".subgroup-"+t);i.data("is_expanded",e),e?(n.fadeIn("fast"),i.removeClass("toggle-expand"),i.addClass("toggle")):(n.hide(),i.removeClass("toggle"),i.addClass("toggle-expand"))},_templateOptions:function(e){function n(t,e){var i=t.find(".button-"+e);i.on("click",function(){o._setState(e,!i.data("is_expanded"))})}function s(e,r,l){l=l||[];for(i in r){var c=r[i],d=c.options.length>0,h=l.slice(0);o.header_index[c.value]=h.slice(0);var u=a("
");if(d){var p=t.uid(),f=a(''),g=a('