From 50ed237526f1ccb57724c94fd1d1ffa2a23a690b Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Tue, 27 Dec 2016 13:59:04 +0000 Subject: [PATCH] Abbrechen bei new-user-form und kleinere Anpassungen --- web/ui/ui.js | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 insertions(+), 5 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index af818d5..5da03e6 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 ------ */ @@ -197,7 +223,7 @@ 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); -- Gitblit v1.9.3