diff --git a/src/emc-metalnx-shared/src/main/resources/views/bookmarks/userBookmarks.html b/src/emc-metalnx-shared/src/main/resources/views/bookmarks/userBookmarks.html index 2bb0ab48d..0ce5964d6 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/bookmarks/userBookmarks.html +++ b/src/emc-metalnx-shared/src/main/resources/views/bookmarks/userBookmarks.html @@ -87,6 +87,7 @@

"language": i18n, "destroy": true, "autoWidth": false, + "searching": false, "ajax": { url: '/emc-metalnx-web/userBookmarks/bookmarksPaginated/', }, diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html index 073b9a6d5..75075fc93 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html +++ b/src/emc-metalnx-shared/src/main/resources/views/collections/collectionManagement.html @@ -999,6 +999,7 @@

"language": i18n, "destroy": true, "autoWidth": false, + "searching": false, "ajax": { url: urlService, "data": function ( d ) { diff --git a/src/emc-metalnx-shared/src/main/resources/views/collections/templateFieldListForCollections.html b/src/emc-metalnx-shared/src/main/resources/views/collections/templateFieldListForCollections.html index 281a192c6..1e2bb52a6 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/collections/templateFieldListForCollections.html +++ b/src/emc-metalnx-shared/src/main/resources/views/collections/templateFieldListForCollections.html @@ -118,6 +118,7 @@ "language": i18n, "stateSave": true, "autoWidth": false, + "searching": false, "stateSaveParams": function (settings, data) { data.search.search = ""; }, diff --git a/src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html b/src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html index 697d939fc..d425f183f 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html +++ b/src/emc-metalnx-shared/src/main/resources/views/favorites/favorites.html @@ -79,6 +79,7 @@

"language": i18n, "destroy": true, "autoWidth": false, + "searching": false, "ajax": { url: '/emc-metalnx-web/favorites/favoritesPaginated/', }, diff --git a/src/emc-metalnx-shared/src/main/resources/views/permissions/permissionDetails.html b/src/emc-metalnx-shared/src/main/resources/views/permissions/permissionDetails.html index 66065fc22..f75d7bfd5 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/permissions/permissionDetails.html +++ b/src/emc-metalnx-shared/src/main/resources/views/permissions/permissionDetails.html @@ -268,6 +268,7 @@

"language": i18n, "stateSave": true, "autoWidth": false, + "searching": false, "stateSaveParams": function (settings, data) { data.search.search = ""; }, diff --git a/src/emc-metalnx-shared/src/main/resources/views/template/templateList.html b/src/emc-metalnx-shared/src/main/resources/views/template/templateList.html index fb4a36af4..f436926ef 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/template/templateList.html +++ b/src/emc-metalnx-shared/src/main/resources/views/template/templateList.html @@ -25,7 +25,7 @@
- +
@@ -42,21 +42,21 @@ - + - @@ -65,8 +65,8 @@
- + - @@ -76,7 +76,7 @@
- +
- -
- - + + - \ No newline at end of file + diff --git a/src/emc-metalnx-shared/src/main/resources/views/tickets/tickets.html b/src/emc-metalnx-shared/src/main/resources/views/tickets/tickets.html index 113715f41..b5669e7c4 100755 --- a/src/emc-metalnx-shared/src/main/resources/views/tickets/tickets.html +++ b/src/emc-metalnx-shared/src/main/resources/views/tickets/tickets.html @@ -201,6 +201,7 @@

"language": i18n, "destroy": false, "autoWidth": false, + "searching": false, "processing": true, "stateSaveParams": function (settings, data) { data.search.search = ""; diff --git a/src/emc-metalnx-ui-admin/src/main/resources/views/groups/groupForm.html b/src/emc-metalnx-ui-admin/src/main/resources/views/groups/groupForm.html index c6f50173b..1808aeea4 100755 --- a/src/emc-metalnx-ui-admin/src/main/resources/views/groups/groupForm.html +++ b/src/emc-metalnx-ui-admin/src/main/resources/views/groups/groupForm.html @@ -30,51 +30,51 @@ function showRecursiveQuestion(collectionName){ $("[id='recursiveQuestion_" + collectionName + "']").removeClass('hideElement'); } - + //change permissions for the group function changePermission(path, collectionName, recursive){ hideRecursiveQuestion(collectionName); var permission = $("[id='permission_" + collectionName + "']").val(); var url; - + var bookmarkCheckbox = $("input[name='" + path + "']"); - + //identify permission and add it to user if(permission == 'read'){ - + url = "/emc-metalnx-web/groups/addReadPermission/"; ajaxEncapsulation(url, "POST", {path: path, recursive: recursive}, function (data) { checkGroupBookmark(bookmarkCheckbox); }, null, null); - ajaxEncapsulation('/emc-metalnx-web/groupBookmarks/addBookmark/', "POST", {path:path, recursive}, null, null, null); - + ajaxEncapsulation('/emc-metalnx-web/groupBookmarks/addBookmark/', "POST", {path:path, recursive}, null, null, null); + } else if(permission == 'write'){ - + url = "/emc-metalnx-web/groups/addWritePermission/"; ajaxEncapsulation(url, "POST", {path: path, recursive: recursive}, function (data) { checkGroupBookmark(bookmarkCheckbox); }, null, null); - ajaxEncapsulation('/emc-metalnx-web/groupBookmarks/addBookmark/', "POST", {path:path}, null, null, null); - + ajaxEncapsulation('/emc-metalnx-web/groupBookmarks/addBookmark/', "POST", {path:path}, null, null, null); + } else if(permission == 'own'){ - + url = "/emc-metalnx-web/groups/addOwner/"; ajaxEncapsulation(url, "POST", {path: path, recursive: recursive}, function (data) { checkGroupBookmark(bookmarkCheckbox); }, null, null); - ajaxEncapsulation('/emc-metalnx-web/groupBookmarks/addBookmark/', "POST", {path:path}, null, null, null); - - } else { + ajaxEncapsulation('/emc-metalnx-web/groupBookmarks/addBookmark/', "POST", {path:path}, null, null, null); + + } else { //this case is for when user chooses to give none of the permissions above url = "/emc-metalnx-web/groups/removeReadPermission/"; ajaxEncapsulation(url, "POST", {path: path, recursive: recursive}, null, null, null); - + url = "/emc-metalnx-web/groups/removeWritePermission/"; ajaxEncapsulation(url, "POST", {path: path, recursive: recursive}, null, null, null); - + url = "/emc-metalnx-web/groups/removeOwner/"; ajaxEncapsulation(url, "POST", {path: path, recursive: recursive}, null, null, null); - + bookmarkCheckbox.prop('checked', false); bookmarkCheckbox.attr("disabled", true); @@ -82,17 +82,17 @@ ajaxEncapsulation('/emc-metalnx-web/groupBookmarks/removeBookmark/', "POST", {path:path}, null, null, null); } } - + function checkGroupBookmark(bookmarkCheckbox) { bookmarkCheckbox.prop("disabled", false); bookmarkCheckbox.prop('checked', true); } - + // Toggles the inheritance of a given directory function toggleInheritance(collectionName, recursive) { var collectionNameParts = collectionName.split("/"); var collectionShortName = collectionNameParts[collectionNameParts.length - 1]; - + var url = ""; var checkbox = $("#inheritance_" + collectionShortName); if (checkbox.is(":checked")) { @@ -180,7 +180,7 @@

@@ -229,7 +229,7 @@

@@ -333,26 +333,27 @@

- - + + - \ No newline at end of file + diff --git a/src/emc-metalnx-ui-admin/src/main/resources/views/resources/resourceList.html b/src/emc-metalnx-ui-admin/src/main/resources/views/resources/resourceList.html index c665e39f5..932238f02 100755 --- a/src/emc-metalnx-ui-admin/src/main/resources/views/resources/resourceList.html +++ b/src/emc-metalnx-ui-admin/src/main/resources/views/resources/resourceList.html @@ -26,9 +26,9 @@
- +
- + @@ -62,7 +62,7 @@
- + - + - + - + +
- \ No newline at end of file + diff --git a/src/emc-metalnx-ui-admin/src/main/resources/views/rules/rulesManagement.html b/src/emc-metalnx-ui-admin/src/main/resources/views/rules/rulesManagement.html index 1fc6540e5..1f87e22f6 100755 --- a/src/emc-metalnx-ui-admin/src/main/resources/views/rules/rulesManagement.html +++ b/src/emc-metalnx-ui-admin/src/main/resources/views/rules/rulesManagement.html @@ -135,6 +135,7 @@

"language": i18n, "destroy": true, "stateSave": true, + "searching": false, "autoWidth": false, "processing": true, "stateSaveParams": function (settings, data) { @@ -308,4 +309,3 @@

- diff --git a/src/emc-metalnx-ui-admin/src/main/resources/views/userProfile/userProfileList.html b/src/emc-metalnx-ui-admin/src/main/resources/views/userProfile/userProfileList.html index 0deeb99d4..8fb12635f 100755 --- a/src/emc-metalnx-ui-admin/src/main/resources/views/userProfile/userProfileList.html +++ b/src/emc-metalnx-ui-admin/src/main/resources/views/userProfile/userProfileList.html @@ -24,9 +24,9 @@
- +
- +
@@ -36,7 +36,7 @@ - + @@ -57,7 +57,7 @@
- +
- +
- - + + - + - + - \ No newline at end of file + diff --git a/src/emc-metalnx-ui-admin/src/main/resources/views/users/userList.html b/src/emc-metalnx-ui-admin/src/main/resources/views/users/userList.html index 7bd3e3988..99740bc52 100755 --- a/src/emc-metalnx-ui-admin/src/main/resources/views/users/userList.html +++ b/src/emc-metalnx-ui-admin/src/main/resources/views/users/userList.html @@ -27,7 +27,7 @@
- +
@@ -64,7 +64,7 @@
- +