From f017c089f5ea740f3e4e458ff976e987ad2426ee Mon Sep 17 00:00:00 2001 From: Christian Hofmaier Date: Mon, 10 Apr 2017 18:58:26 +0200 Subject: [permission-manager] moved multiple code, added text-search to rolesTable --- .../permissionmanager/clientscript.js | 44 ++++++++++++++++ .../permissionmanager/lang/de/template-tags.json | 3 +- .../permissionmanager/lang/en/template-tags.json | 3 +- .../templates/locationstable.html | 58 ++-------------------- .../permissionmanager/templates/roleeditor.html | 4 -- .../permissionmanager/templates/rolestable.html | 32 ++++++++++-- .../permissionmanager/templates/userstable.html | 51 +------------------ 7 files changed, 84 insertions(+), 111 deletions(-) (limited to 'modules-available') diff --git a/modules-available/permissionmanager/clientscript.js b/modules-available/permissionmanager/clientscript.js index da825984..edbd3eb9 100644 --- a/modules-available/permissionmanager/clientscript.js +++ b/modules-available/permissionmanager/clientscript.js @@ -9,4 +9,48 @@ document.addEventListener("DOMContentLoaded", function() { var arrow = data.direction === dir.ASC ? "down" : "up"; th.eq(data.column).append(' '); }); + + var selectize = $('#select-role').selectize({ + allowEmptyOption: false, + maxItems: null, + highlight: false, + hideSelected: true, + create: false, + plugins: [ "remove_button" ] + })[0].selectize; + + // If Site gets refreshed, all data-selectizeCounts will be reset to 0, so delete the filters from the selectize + selectize.clear(); + + selectize.on('item_add', function(value, $item) { + // When first item gets added the filter isn't empty anymore, so hide all rows + if (selectize.items.length === 1) { + $('.dataTable tbody').find('tr').hide(); + } + // Find all rows which shall be shown and increase their counter by 1 + $(".roleId-"+value).closest("tr").each(function() { + $(this).data("selectizeCount", $(this).data("selectizeCount") + 1); + $(this).show(); + }); + }); + + selectize.on('item_remove', function(value, $item) { + // When no items in the filter, show all rows again + if (selectize.items.length === 0) { + $('.dataTable tbody').find('tr').show(); + } else { + // Find all rows which have the delete role, decrease their counter by 1 + $(".roleId-"+value).closest("tr").each(function() { + $(this).data("selectizeCount", $(this).data("selectizeCount") - 1); + // If counter is 0, hide the row (no filter given to show the row anymore) + if ($(this).data("selectizeCount") === 0) { + $(this).closest("tr").hide(); + } + }); + } + }); + + $("form input").keydown(function(e) { + if (e.keyCode === 13) e.preventDefault(); + }); }); \ No newline at end of file diff --git a/modules-available/permissionmanager/lang/de/template-tags.json b/modules-available/permissionmanager/lang/de/template-tags.json index 86c03871..e9146d2c 100644 --- a/modules-available/permissionmanager/lang/de/template-tags.json +++ b/modules-available/permissionmanager/lang/de/template-tags.json @@ -18,5 +18,6 @@ "lang_all": "alle", "lang_selected": "ausgewählte", "lang_Permissions": "Rechte", - "lang_selectizePlaceholder": "Nach Rollen filtern..." + "lang_selectizePlaceholder": "Nach Rollen filtern...", + "lang_searchPlaceholder": "Nach Rollen suchen..." } \ No newline at end of file diff --git a/modules-available/permissionmanager/lang/en/template-tags.json b/modules-available/permissionmanager/lang/en/template-tags.json index 82cbc933..ce35a6ce 100644 --- a/modules-available/permissionmanager/lang/en/template-tags.json +++ b/modules-available/permissionmanager/lang/en/template-tags.json @@ -18,5 +18,6 @@ "lang_all": "all", "lang_selected": "selected", "lang_Permissions": "Permissions", - "lang_selectizePlaceholder": "Filter for roles..." + "lang_selectizePlaceholder": "Filter for roles...", + "lang_searchPlaceholder": "Search for roles..." } \ No newline at end of file diff --git a/modules-available/permissionmanager/templates/locationstable.html b/modules-available/permissionmanager/templates/locationstable.html index aa4553f8..ea3a92e8 100644 --- a/modules-available/permissionmanager/templates/locationstable.html +++ b/modules-available/permissionmanager/templates/locationstable.html @@ -1,7 +1,8 @@
-
+
+
- +
+
+ +
+
+ +
+
@@ -16,8 +23,8 @@ {{#roles}} - - {{roleName}} + + {{roleName}} {{lang_Edit}} @@ -62,4 +69,23 @@ function deleteRole($roleId) { $(".modal-footer #deleteId").val($roleId); } + + function searchFieldFunction() { + // Declare variables + var input, filter, table, trs, a, i; + input = document.getElementById('roleNameSearchField'); + filter = input.value.toUpperCase(); + table = document.getElementById("rolesTable"); + trs = table.getElementsByClassName('rolesRow'); + + // Loop through all list items, and hide those who don't match the search query + for (i = 0; i < trs.length; i++) { + a = trs[i].getElementsByClassName("rolesData")[0]; + if (a.innerHTML.toUpperCase().indexOf(filter) > -1) { + trs[i].style.display = ""; + } else { + trs[i].style.display = "none"; + } + } + } \ No newline at end of file diff --git a/modules-available/permissionmanager/templates/userstable.html b/modules-available/permissionmanager/templates/userstable.html index 44b28833..a740c5e8 100644 --- a/modules-available/permissionmanager/templates/userstable.html +++ b/modules-available/permissionmanager/templates/userstable.html @@ -8,7 +8,7 @@