diff options
| author | Simon Rettberg | 2017-12-15 21:37:08 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-12-15 21:37:08 +0100 |
| commit | e41a8074713861bdd8c6ef34d4f3465864bf4cd4 (patch) | |
| tree | 6c62391ce7e1d7944889dc675c0e8ab26cf2dfe6 /modules-available/permissionmanager | |
| parent | [roomplanner] Fix deleting PCs after loading room plan (diff) | |
| parent | [backup] added permissions to create and restore backups (diff) | |
| download | slx-admin-e41a8074713861bdd8c6ef34d4f3465864bf4cd4.tar.gz slx-admin-e41a8074713861bdd8c6ef34d4f3465864bf4cd4.tar.xz slx-admin-e41a8074713861bdd8c6ef34d4f3465864bf4cd4.zip | |
Merge branch 'permission-manager' of openslx.org:openslx-ng/slx-admin into permission-manager
Diffstat (limited to 'modules-available/permissionmanager')
6 files changed, 28 insertions, 9 deletions
diff --git a/modules-available/permissionmanager/clientscript.js b/modules-available/permissionmanager/clientscript.js index 700ebc11..65065e6e 100644 --- a/modules-available/permissionmanager/clientscript.js +++ b/modules-available/permissionmanager/clientscript.js @@ -42,6 +42,12 @@ document.addEventListener("DOMContentLoaded", function() { }); } + $("tr").on('click', function (e) { + if (e.target.type !== "checkbox") { + $(this).find("input:checkbox").trigger("click"); + } + }); + $("form input").keydown(function(e) { if (e.keyCode === 13) e.preventDefault(); }); diff --git a/modules-available/permissionmanager/inc/permissionutil.inc.php b/modules-available/permissionmanager/inc/permissionutil.inc.php index 391cd047..64fe8f26 100644 --- a/modules-available/permissionmanager/inc/permissionutil.inc.php +++ b/modules-available/permissionmanager/inc/permissionutil.inc.php @@ -73,10 +73,9 @@ class PermissionUtil if (!is_array($data)) continue; preg_match('#^modules/([^/]+)/#', $file, $out); - $newData = array(); - foreach( $data as $k => $v ) { - $newData[] = $v; - $permissions = self::putInPermissionTree($out[1].".".$k, $v, $permissions); + foreach( $data as $p ) { + $description = Dictionary::translateFileModule($out[1], "permissions", $p); + $permissions = self::putInPermissionTree($out[1].".".$p, $description, $permissions); } } ksort($permissions); diff --git a/modules-available/permissionmanager/style.css b/modules-available/permissionmanager/style.css index bb03d153..49d631a8 100644 --- a/modules-available/permissionmanager/style.css +++ b/modules-available/permissionmanager/style.css @@ -13,6 +13,11 @@ margin-left: 10px; } +.missingInput { + border-color: rgba(255, 0, 0, 0.8); + box-shadow: 0 1px 1px rgba(255, 0, 0, 0.075) inset, 0 0 8px rgba(255, 0, 0, 0.6); +} + .table { margin-top: 20px; } @@ -41,6 +46,10 @@ margin-bottom: 20px; } +.selectize-input { + overflow: visible; +} + .tree-container .selected { background-color: rgba(0, 182, 41, 0.23); diff --git a/modules-available/permissionmanager/templates/roleeditor.html b/modules-available/permissionmanager/templates/roleeditor.html index 14839ee2..b07e2112 100644 --- a/modules-available/permissionmanager/templates/roleeditor.html +++ b/modules-available/permissionmanager/templates/roleeditor.html @@ -64,7 +64,7 @@ $('form').submit(function () { var name = $.trim($('#rolename').val()); if (name === '') { - alert('{{lang_emptyNameWarning}}'); + $("#rolename").addClass("missingInput"); return false; } }); diff --git a/modules-available/permissionmanager/templates/rolestable.html b/modules-available/permissionmanager/templates/rolestable.html index 99401624..992feca1 100644 --- a/modules-available/permissionmanager/templates/rolestable.html +++ b/modules-available/permissionmanager/templates/rolestable.html @@ -3,11 +3,13 @@ <div class="row"> <div class="col-md-4"> - <button class="btn btn-success" type="button" onclick="openRoleEditor()"><span class="glyphicon glyphicon-plus"></span> {{lang_newRole}}</button> </div> <div class="col-md-4"> <input type="text" class="form-control" id="roleNameSearchField" onkeyup="searchFieldFunction()" placeholder="{{lang_searchPlaceholder}}"> </div> + <div class="col-md-4 text-right"> + <button class="btn btn-success" type="button" onclick="openRoleEditor()"><span class="glyphicon glyphicon-plus"></span> {{lang_newRole}}</button> + </div> </div> <div class="row"> diff --git a/modules-available/permissionmanager/templates/userstable.html b/modules-available/permissionmanager/templates/userstable.html index bd48d16d..9f684e99 100644 --- a/modules-available/permissionmanager/templates/userstable.html +++ b/modules-available/permissionmanager/templates/userstable.html @@ -3,10 +3,8 @@ <div class="row"> <div class="col-md-4"> - <button class="btn btn-success" type="button" data-toggle="modal" data-target="#addRoleToUserModal"><span class="glyphicon glyphicon-share-alt"></span> {{lang_addRole}}</button> - <button class="btn btn-danger" type="button" data-toggle="modal" data-target="#removeRoleFromUserModal"><span class="glyphicon glyphicon-trash"></span> {{lang_removeRole}}</button> </div> - <div class="col-md-4 text-left"> + <div class="col-md-4"> <select multiple name="roles[]" id="select-role"> <option value>{{lang_selectizePlaceholder}}</option> {{#roles}} @@ -14,6 +12,10 @@ {{/roles}} </select> </div> + <div class="col-md-4 text-right"> + <button class="btn btn-success" type="button" data-toggle="modal" data-target="#addRoleToUserModal"><span class="glyphicon glyphicon-share-alt"></span> {{lang_addRole}}</button> + <button class="btn btn-danger" type="button" data-toggle="modal" data-target="#removeRoleFromUserModal"><span class="glyphicon glyphicon-trash"></span> {{lang_removeRole}}</button> + </div> </div> <div class="row"> @@ -152,6 +154,7 @@ }); }); + // if remove-Role button is clicked, uncheck all checkboxes in add-role modal so they aren't submitted too function clearAddRoleModal () { $('#addRoleToUserModal') |