From 0b4f6dde9e047b4a71c3fbfa6bff6b34e5698f5e Mon Sep 17 00:00:00 2001 From: Simon Bray Date: Thu, 29 Oct 2020 17:58:29 +0100 Subject: [PATCH 1/2] disable dataset edit button after deletion --- client/src/mvc/dataset/dataset-li-edit.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/client/src/mvc/dataset/dataset-li-edit.js b/client/src/mvc/dataset/dataset-li-edit.js index a4d9a7907d8..5a913a45ce2 100644 --- a/client/src/mvc/dataset/dataset-li-edit.js +++ b/client/src/mvc/dataset/dataset-li-edit.js @@ -63,13 +63,15 @@ var DatasetListItemEdit = _super.extend( faIcon: "fa-pencil", classes: "edit-btn", onclick: function (ev) { - const Galaxy = getGalaxyInstance(); - if (Galaxy.router) { - ev.preventDefault(); - const identifier = self.model.get("element_id") || self.model.get("id"); - Galaxy.router.push("datasets/edit", { - dataset_id: identifier, - }); + if (!disabled) { + const Galaxy = getGalaxyInstance(); + if (Galaxy.router) { + ev.preventDefault(); + const identifier = self.model.get("element_id") || self.model.get("id"); + Galaxy.router.push("datasets/edit", { + dataset_id: identifier, + }); + } } }, }; From e094a8e05d7b0595cf845cf0e32e82d046d1097d Mon Sep 17 00:00:00 2001 From: Simon Bray <32272674+simonbray@users.noreply.github.com> Date: Thu, 29 Oct 2020 22:17:50 +0100 Subject: [PATCH 2/2] fix linting --- client/src/mvc/dataset/dataset-li-edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/mvc/dataset/dataset-li-edit.js b/client/src/mvc/dataset/dataset-li-edit.js index 5a913a45ce2..a30dae0c9a2 100644 --- a/client/src/mvc/dataset/dataset-li-edit.js +++ b/client/src/mvc/dataset/dataset-li-edit.js @@ -63,7 +63,7 @@ var DatasetListItemEdit = _super.extend( faIcon: "fa-pencil", classes: "edit-btn", onclick: function (ev) { - if (!disabled) { + if (!deleted && !purged) { const Galaxy = getGalaxyInstance(); if (Galaxy.router) { ev.preventDefault();