public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 23:35:57 +00:00
Code Issues Releases Wiki Activity

* remove users/filters toolbar edit button (just click on it)

Browse Source 
* fix title of edit filter dialog always showing create filter
This commit is contained in:
Andrew Dolgov
2021-02-14 15:38:45 +03:00
parent a8cc43a0ff
commit 0fbf109912
5 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/pref/filters.php
View File

@@ -736,8 +736,6 @@ class Pref_Filters extends Handler_Protected {
<?= __('Create filter') ?></button> <?= __('Create filter') ?></button>
<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').joinSelectedFilters()"> <button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').joinSelectedFilters()">
<?= __('Combine') ?></button> <?= __('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()"> <button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').resetFilterOrder()">
<?= __('Reset sort order') ?></button> <?= __('Reset sort order') ?></button>
<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').removeSelectedFilters()"> <button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').removeSelectedFilters()">

4
classes/pref/users.php
View File

@@ -346,10 +346,6 @@ class Pref_Users extends Handler_Protected {
<?= __('Create user') ?> <?= __('Create user') ?>
</button> </button>
<button dojoType='dijit.form.Button' onclick='Users.editSelected()'>
<?= __('Edit') ?>
</button dojoType="dijit.form.Button">
<button dojoType='dijit.form.Button' onclick='Users.removeSelected()'> <button dojoType='dijit.form.Button' onclick='Users.removeSelected()'>
<?= __('Remove') ?> <?= __('Remove') ?>
</button> </button>

2
js/CommonFilters.js
View File

@@ -243,7 +243,7 @@ const Filters = {
try { try {
const dialog = new fox.SingleUseDialog({ const dialog = new fox.SingleUseDialog({
id: "filterEditDlg", id: "filterEditDlg",
title: __("Create Filter"), title: id ? __("Edit Filter") : __("Create Filter"),
test: function () { test: function () {
Filters.test(this.attr('value')); Filters.test(this.attr('value'));
}, },

17
js/PrefFilterTree.js
View File

@@ -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() { removeSelectedFilters: function() {
const sel_rows = this.getSelectedFilters(); const sel_rows = this.getSelectedFilters();

15
js/PrefUsers.js
View File

@@ -93,21 +93,6 @@ const Users = {
alert(__("No users selected.")); 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() { getSelection :function() {
return Tables.getSelected("users-list"); return Tables.getSelected("users-list");
} }