opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-21 13:50:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Client-format post-merge

Browse Source
This commit is contained in:
Dannon Baker
2018-02-05 13:06:29 -05:00
parent 0704d63d0b
commit f0a8243f7d
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/collection/collection-model.js
+1 -1
View File
@@ -288,7 +288,7 @@ var DatasetCollection = Backbone.Model.extend(BASE_MVC.LoggableMixin)
if (this.get("deleted")) {
return jQuery.when();
}
options = Utils.merge(options, {"method": "delete"});
options = Utils.merge(options, { method: "delete" });
return this.save({ deleted: true, recursive: recursive, purge: purge }, options);
},
/** save this collection, _Mark_ing it as undeleted */
client/galaxy/scripts/mvc/history/hdca-li-edit.js
+2 -3
View File
@@ -35,7 +35,7 @@ var HDCAListItemEdit = _super.extend(
_renderDeleteButton: function() {
return $(`
<div class="dropdown">
<a class="delete-btn icon-btn" title="${_l('Delete')}" data-toggle="dropdown">
<a class="delete-btn icon-btn" title="${_l("Delete")}" data-toggle="dropdown">
<span class="fa fa-times"></span>
</a>
<ul class="dropdown-menu pull-right" role="menu">
@@ -49,7 +49,7 @@ var HDCAListItemEdit = _super.extend(
${_l("Delete Datasets")}
</a>
</li>
<li style="display: ${this.purgeAllowed ? 'inherit' : 'none'}">
<li style="display: ${this.purgeAllowed ? "inherit" : "none"}">
<a href="" class="delete-collection-and-purge-datasets">
${_l("Permanently Delete Datasets")}
</a>
@@ -58,7 +58,6 @@ var HDCAListItemEdit = _super.extend(
</div>`);
},
// ......................................................................... misc
events: _.extend(_.clone(_super.prototype.events), {
"click .delete-collection": function(ev) {