From dd6b8be145daef023344acc70af0dd18146b73a9 Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Tue, 27 Dec 2016 12:45:27 +0000 Subject: [PATCH] user.jsp durch user.html ersetzt --- web/ui/ui.js | 126 +++++++++++++++++++++++++++++++++++------ 1 files changed, 107 insertions(+), 19 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index ce2d447..c6e9098 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -5,9 +5,14 @@ $('#nutzerLoeschen').click(um_del_user); $('#nutzerNeu').click(um_new_user); $('#nutzerLoeschen').prop( "disabled", true ); + $('#nutzerRolleEntziehen').prop( "disabled", true ); + $('#rolleErteilen').prop( "disabled", true ); $('#neueRolle').click(um_new_role); + $('#rollen').click(um_role_list_click); + $('#nutzerrollen').click(um_user_role_list_click); um_clear_user_form(); um_apicall_get_user_list(); + um_apicall_get_granted_roles(); } /* ----- user functions ------ */ @@ -18,21 +23,14 @@ if(user.pw != kww) { alert('Kennworte stimmen nicht ueberein.'); } else { - //alert('user-save ' + user.id); um_apicall_create_user(self.serialisieren(user)); } } function um_del_user() { - /*var users = []; - $('#nutzerliste :selected').each(function(i, selected){ - users[i] = $(selected).text(); - });*/ - - //alert('delete user ' + users[0]); var userId = um_get_first_selected_user_id(); if(userId !== 'none') { - var antwort = confirm("Wollen Sie den Nutzer " + usersId + " loeschen?"); + var antwort = confirm("Wollen Sie den Nutzer " + userId + " loeschen?"); if (antwort === true) { var user = new User(userId, '-', '-', '-', '-'); um_apicall_del_user(self.serialisieren(user)); @@ -47,6 +45,7 @@ /* ----------- role functions ------------ */ function um_new_role() { + var roleIsNew = true; var userId = um_get_first_selected_user_id(); if(userId === 'none') { alert('Es wurde kein Benutzer ausgewaehlt.'); @@ -55,7 +54,7 @@ if (answer === null) { alert("Es wurde Cancel betaetigt."); } else if(answer !== "") { - alert("Rolle fuer Benutzer " + userId + " anlegen: " + answer); + um_apicall_grant_role(userId, answer, roleIsNew); } else { alert("OK betaetigt, aber Keine Rolle angegeben."); } @@ -66,13 +65,16 @@ function um_user_list_click() { $('#nutzerLoeschen').prop( "disabled", false ); - /* - var users = []; - $('#nutzerliste :selected').each(function(i, selected){ - users[i] = $(selected).text(); - }); - */ - //alert(users[0]); + var userId = um_get_first_selected_user_id(); + um_apicall_get_user_roles(userId); +} + +function um_role_list_click() { + $('#rolleErteilen').prop( "disabled", false ); +} + +function um_user_role_list_click() { + $('#nutzerRolleEntziehen').prop( "disabled", false ); } @@ -93,9 +95,6 @@ $("#nutzerliste").append('<option value=' + user.String + '>' + user.String + '</option>'); } $('#nutzerLoeschen').prop( "disabled", true ); - //var user1 = users.List[1]; - //var username = user1.String; - //alert(username); } function um_clear_user_form() { @@ -116,6 +115,27 @@ return userId; } +// {"List":[{"List":[{"String":"ROLE_NAME"},{"String":"testrolle1"}]}]} +function um_show_user_role_list(resp) { + $("#nutzerrollen").empty(); + var rollen = resp.List[0]; + for(var i = 1; i < rollen.List.length; i++) { + var rolle = rollen.List[i]; + $("#nutzerrollen").append('<option value=' + rolle.String + '>' + rolle.String + '</option>'); + } + $('#nutzerRolleEntziehen').prop( "disabled", true ); +} + +function um_show_role_list(resp) { + $("#rollen").empty(); + var rollen = resp.List[0]; + for(var i = 1; i < rollen.List.length; i++) { + var rolle = rollen.List[i]; + $("#rollen").append('<option value=' + rolle.String + '>' + rolle.String + '</option>'); + } + //$('#neueRolle').prop( "disabled", true ); + $('#rolleErteilen').prop( "disabled", true ); +} /* ---- api calls ----- */ function um_apicall_create_user(user) { @@ -183,6 +203,74 @@ }); } +// public UserRole grantRole(String userId, String roleName) +function um_apicall_grant_role(userId, roleName, isNewRole) { + var m = 'grantRole'; + var u = '../svc/' + m; + $.ajax({ + url: u, + data: { + p1: userId, + p2: roleName + }, + type: "POST", + dataType : "html", + success: function( resp ) { + um_apicall_get_user_roles(userId); + if(isNewRole) { + um_apicall_get_granted_roles(); + } + }, + error: function( xhr, status, errorThrown ) { + $('#fehler').html("Error: " + errorThrown + " Status: " + status); + }, + complete: function( xhr, status ) { + //alert( "The request is complete!" ); + } + }); +} + +//public List getUserRoleNames(String userId) +function um_apicall_get_user_roles(userId) { + var m = 'getUserRoleNames'; + var u = '../svc/' + m + '?p=' + userId; + $.ajax({ + url: u, + type: "GET", + dataType : "json", + success: function( resp ) { + // Antwort in Liste anzeigen + um_show_user_role_list(resp); + }, + error: function( xhr, status, errorThrown ) { + $('#fehler').html("Error: " + errorThrown + " Status: " + status); + }, + complete: function( xhr, status ) { + //alert( "The request is complete!" ); + } + }); +} + +function um_apicall_get_granted_roles() { + var m = 'getRoleNamesGranted'; + var u = '../svc/' + m; + $.ajax({ + url: u, + type: "GET", + dataType : "json", + success: function( resp ) { + // Antwort in Liste anzeigen + um_show_role_list(resp); + }, + error: function( xhr, status, errorThrown ) { + $('#fehler').html("Error: " + errorThrown + " Status: " + status); + }, + complete: function( xhr, status ) { + //alert( "The request is complete!" ); + } + }); +} + /* ----- Hilfsfunktionen ----- */ function serialisieren(obj) { -- Gitblit v1.9.3