From 9e512f52465c158855c2a0750d8a7d794316940e Mon Sep 17 00:00:00 2001 From: carlfeberhard Date: Fri, 11 Dec 2015 08:44:45 -0500 Subject: [PATCH] UI, History: use copy dialog in the embedded histories in Pages, add autoClose option to copy dialog --- .../galaxy/scripts/mvc/history/copy-dialog.js | 6 +- lib/galaxy/model/__init__.py | 5 +- static/maps/mvc/history/copy-dialog.js.map | 2 +- static/maps/mvc/tool/tools-form-base.js.map | 2 +- static/scripts/bundled/analysis.bundled.js | 4 +- .../scripts/bundled/analysis.bundled.js.map | 2 +- static/scripts/bundled/libs.bundled.js.map | 2 +- static/scripts/mvc/history/copy-dialog.js | 2 +- static/scripts/mvc/tool/tools-form-base.js | 2 +- static/scripts/utils/ajax-queue.js | 60 +---------------- templates/webapps/galaxy/history/embed.mako | 64 ++++++++++++++----- 11 files changed, 63 insertions(+), 88 deletions(-) diff --git a/client/galaxy/scripts/mvc/history/copy-dialog.js b/client/galaxy/scripts/mvc/history/copy-dialog.js index ca9354ee6f2..4a6ef869a40 100644 --- a/client/galaxy/scripts/mvc/history/copy-dialog.js +++ b/client/galaxy/scripts/mvc/history/copy-dialog.js @@ -79,10 +79,12 @@ var CopyDialog = { defaultCopyName = defaultCopyNameFn({ name: history.get( 'name' ) }), // TODO: these two might be simpler as one 3 state option (all,active,no-choice) defaultCopyWhat = options.allDatasets? 'copy-all' : 'copy-non-deleted', - allowAll = !_.isUndefined( options.allowAll )? options.allowAll : true; + allowAll = !_.isUndefined( options.allowAll )? options.allowAll : true, + autoClose = !_.isUndefined( options.autoClose )? options.autoClose : true; this.modal = modal; + // validate the name and copy if good function checkNameAndCopy(){ var name = modal.$( '#copy-modal-title' ).val(); @@ -104,7 +106,7 @@ var CopyDialog = { deferred.rejectWith( deferred, arguments ); }) .always( function(){ - modal.hide(); + if( autoClose ){ modal.hide(); } }); } diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index 606f75a6659..0d619b6a77f 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -1203,6 +1203,7 @@ class History( object, Dictifiable, UsesAnnotations, HasName ): # Create new history. if not name: name = self.name + # wut. If it's an anon user, the target user becomes the original owner?? if not target_user: target_user = self.user quota = True @@ -1213,10 +1214,6 @@ class History( object, Dictifiable, UsesAnnotations, HasName ): db_session.add( new_history ) db_session.flush() - print '-' * 40 - print 'target_user:', target_user, target_user.username, target_user.email - print '-' * 40 - # copy history tags and annotations (if copying user is not anonymous) if target_user: self.copy_item_annotation( db_session, self.user, self, target_user, new_history ) diff --git a/static/maps/mvc/history/copy-dialog.js.map b/static/maps/mvc/history/copy-dialog.js.map index 69ab4121769..9c9d8ad6996 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","useImport"],"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","autoClose","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/maps/mvc/tool/tools-form-base.js.map b/static/maps/mvc/tool/tools-form-base.js.map index 5772dad9d56..89d5e6b947e 100644 --- a/static/maps/mvc/tool/tools-form-base.js.map +++ b/static/maps/mvc/tool/tools-form-base.js.map @@ -1 +1 @@ -{"version":3,"file":"tools-form-base.js","sources":["../../../src/mvc/tool/tools-form-base.js"],"names":["define","Utils","Deferred","Ui","Form","ToolTemplate","CitationModel","CitationView","Backbone","View","extend","initialize","options","this","merge","setElement","deferred","inputs","_buildForm","self","execute","process","_buildModel","remove","$el","hide","prototype","call","Galaxy","emit","debug","icon","title","name","description","version","operations","_operations","onchange","reset","_updateModel","customize","form","_footer","empty","append","hide_message","id","build_url","build_data","job_id","root","params","tool_id","$","request","type","url","data","success","new_model","message","update","status","persistent","resolve","error","response","error_message","err_msg","is","prepend","Message","large","modal","show","body","buttons","Close","reject","model_url","update_url","current_state","tool_version","create","wait","versions_button","ButtonMenu","narrow","tooltip","is_workflow","versions","length","i","addMenu","onclick","replace","menu_button","biostar_url","window","open","prompt","location","origin","user","get","href","download","requirements","visible","sharable_url","menu","help","citations","$citations","ToolCitationCollection","citation_list_view","CitationListView","el","collection","render","fetch"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"tools-form-base.js","sources":["../../../src/mvc/tool/tools-form-base.js"],"names":["define","Utils","Deferred","Ui","Form","ToolTemplate","CitationModel","CitationView","Backbone","View","extend","initialize","options","this","merge","setElement","deferred","inputs","_buildForm","self","execute","process","_buildModel","remove","$el","hide","prototype","call","Galaxy","emit","debug","icon","title","name","description","version","operations","_operations","onchange","reset","_updateModel","customize","form","_footer","empty","append","hide_message","id","build_url","build_data","job_id","root","params","tool_id","$","request","type","url","data","success","new_model","message","update","status","persistent","resolve","error","response","error_message","err_msg","is","prepend","Message","large","modal","show","body","buttons","Close","reject","model_url","update_url","current_state","tool_version","create","wait","versions_button","ButtonMenu","narrow","tooltip","is_workflow","versions","length","i","addMenu","onclick","replace","menu_button","biostar_url","window","open","prompt","location","origin","user","get","href","download","requirements","visible","sharable_url","menu","help","citations","$citations","ToolCitationCollection","citation_list_view","CitationListView","el","collection","render","fetch"],"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 a9629c85e66..89c0717df84 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('