diff options
| -rwxr-xr-x | classes/pref/filters.php | 2 | ||||
| -rw-r--r-- | classes/pref/users.php | 4 | ||||
| -rw-r--r-- | js/CommonFilters.js | 2 | ||||
| -rw-r--r-- | js/PrefFilterTree.js | 17 | ||||
| -rw-r--r-- | js/PrefUsers.js | 15 |
5 files changed, 1 insertions, 39 deletions
diff --git a/classes/pref/filters.php b/classes/pref/filters.php index c898a8b67..1c264f642 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -736,8 +736,6 @@ class Pref_Filters extends Handler_Protected { <?= __('Create filter') ?></button> <button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').joinSelectedFilters()"> <?= __('Combine') ?></button> - <button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').editSelectedFilter()"> - <?= __('Edit') ?></button> <button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').resetFilterOrder()"> <?= __('Reset sort order') ?></button> <button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').removeSelectedFilters()"> diff --git a/classes/pref/users.php b/classes/pref/users.php index 24d28e62a..7adb09ab2 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -346,10 +346,6 @@ class Pref_Users extends Handler_Protected { <?= __('Create user') ?> </button> - <button dojoType='dijit.form.Button' onclick='Users.editSelected()'> - <?= __('Edit') ?> - </button dojoType="dijit.form.Button"> - <button dojoType='dijit.form.Button' onclick='Users.removeSelected()'> <?= __('Remove') ?> </button> diff --git a/js/CommonFilters.js b/js/CommonFilters.js index 15403b8c4..06e0410c7 100644 --- a/js/CommonFilters.js +++ b/js/CommonFilters.js @@ -243,7 +243,7 @@ const Filters = { try { const dialog = new fox.SingleUseDialog({ id: "filterEditDlg", - title: __("Create Filter"), + title: id ? __("Edit Filter") : __("Create Filter"), test: function () { Filters.test(this.attr('value')); }, diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js index abfdbb3b0..e7d4efdc1 100644 --- a/js/PrefFilterTree.js +++ b/js/PrefFilterTree.js @@ -119,23 +119,6 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio }); } }, - editSelectedFilter: function() { - const rows = this.getSelectedFilters(); - - if (rows.length == 0) { - alert(__("No filters selected.")); - return; - } - - if (rows.length > 1) { - alert(__("Please select only one filter.")); - return; - } - - Notify.close(); - - this.editFilter(rows[0]); - }, removeSelectedFilters: function() { const sel_rows = this.getSelectedFilters(); diff --git a/js/PrefUsers.js b/js/PrefUsers.js index 0a7e635fe..e5c281811 100644 --- a/js/PrefUsers.js +++ b/js/PrefUsers.js @@ -93,21 +93,6 @@ const Users = { alert(__("No users selected.")); } }, - editSelected: function() { - const rows = this.getSelection(); - - if (rows.length == 0) { - alert(__("No users selected.")); - return; - } - - if (rows.length > 1) { - alert(__("Please select one user.")); - return; - } - - this.edit(rows[0]); - }, getSelection :function() { return Tables.getSelected("users-list"); } |