From 6240cdca43495122d436de8488395bf7fd5eae12 Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Tue, 27 Dec 2016 16:39:26 +0000 Subject: [PATCH] Tomcat-spezifischen Digester in eine Schnittstelle ausgelagert und per Deployment Descriptor konfigurierbar eingebunden --- web/ui/ui.js | 43 +++++++++++++++++++++++++++++++------------ 1 files changed, 31 insertions(+), 12 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index af818d5..1de6543 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -1,7 +1,11 @@ function um_init() { $('#user-form').hide(); + $('#nav').hide(); + $('#role-form').hide(); + $('#user-role-form').hide(); $('.user-save-btn').click(um_user_save); + $('.user-cancel-btn').click(um_back_from_new_user); $('#nutzerliste').click(um_user_list_click); $('#nutzerLoeschen').click(um_del_user); $('#nutzerNeu').click(um_new_user); @@ -39,10 +43,6 @@ um_apicall_del_user(self.serialisieren(user)); } } -} - -function um_new_user() { - alert('show form to enter new user'); } /* ----------- role functions ------------ */ @@ -84,10 +84,23 @@ /* ----------- ui interaction ------------ */ function um_user_list_click() { + $('#nav-back-btn').click(um_back_from_roles); $('#nutzerLoeschen').prop( "disabled", false ); $('#rollen :selected').prop("selected", false); var userId = um_get_first_selected_user_id(); + $('#userid').html(userId); um_apicall_get_user_roles(userId); + $('#user-list-form').hide(); + $('#nav').show(); + $('#role-form').show(); + $('#user-role-form').show(); +} + +function um_new_user() { + $('#nav-back-btn').click(um_back_from_new_user); + $('#user-list-form').hide(); + $('#user-form').show(); + $('#nav').show(); } function um_role_list_click() { @@ -98,6 +111,19 @@ $('#nutzerRolleEntziehen').prop( "disabled", false ); } +function um_back_from_roles() { + $('#user-list-form').show(); + $('#nav').hide(); + $('#role-form').hide(); + $('#user-role-form').hide(); +} + +function um_back_from_new_user() { + $('#user-list-form').show(); + $('#nav').hide(); + $('#user-form').hide(); + um_clear_user_form(); +} /* ------- ui i/o ------ */ @@ -160,7 +186,6 @@ return roleId; } -// {"List":[{"List":[{"String":"ROLE_NAME"},{"String":"testrolle1"}]}]} function um_show_user_role_list(resp) { $("#nutzerrollen").empty(); var rollen = resp.List[0]; @@ -178,7 +203,6 @@ var rolle = rollen.List[i]; $("#rollen").append('<option value=' + rolle.String + '>' + rolle.String + '</option>'); } - //$('#neueRolle').prop( "disabled", true ); $('#rolleErteilen').prop( "disabled", true ); } @@ -195,9 +219,8 @@ type: "POST", dataType : "html", success: function( resp ) { - //$('#fehler').html('Antwort: ' + resp); um_apicall_get_user_list(); - um_clear_user_form(); + um_back_from_new_user(); }, error: function( xhr, status, errorThrown ) { $('#fehler').html("Error: " + errorThrown + " Status: " + status); @@ -249,7 +272,6 @@ }); } -// public UserRole grantRole(String userId, String roleName) function um_apicall_grant_role(userId, roleName, isNewRole) { var m = 'grantRole'; var u = '../svc/' + m; @@ -299,7 +321,6 @@ }); } -//public List getUserRoleNames(String userId) function um_apicall_get_user_roles(userId) { var m = 'getUserRoleNames'; var u = '../svc/' + m + '?p=' + userId; @@ -308,7 +329,6 @@ type: "GET", dataType : "json", success: function( resp ) { - // Antwort in Liste anzeigen um_show_user_role_list(resp); }, error: function( xhr, status, errorThrown ) { @@ -328,7 +348,6 @@ type: "GET", dataType : "json", success: function( resp ) { - // Antwort in Liste anzeigen um_show_role_list(resp); }, error: function( xhr, status, errorThrown ) { -- Gitblit v1.9.3