From 0bc3073a6c5c8512184fd8d0e0044eee7e8d47d0 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Wed, 01 Feb 2017 17:31:30 +0000
Subject: [PATCH] auskommentierte Teile entfernt
---
web/ui/ui.js | 102 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 70 insertions(+), 32 deletions(-)
diff --git a/web/ui/ui.js b/web/ui/ui.js
index af818d5..b2efd06 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 ------ */
@@ -108,14 +134,26 @@
return user;
}
+/*
+ * BaseLink liefert fuer einfache selects wie die der Nutzerverwaltung
+ * eine simple Listenfunktion, die auf der JSON-Seite wie folgt
+ * herauskommt.
+ *
+ * {"List":[{"List":[{"String":"USER_NAME"},{"String":"admin"},{"String":"test"}]}]}
+ *
+ * Fuer Mustache sieht ein Template dann z.B so aus:
+ *
+ * {{#List}}
+ * {{#List}}
+ * <option value="{{ String }}">{{ String }}</option>'
+ * {{/List}}
+ * {{/List}}
+ */
function um_show_user_list(resp) {
$("#nutzerliste").empty();
- var users = resp.List[0];
- for(var i = 1; i < users.List.length; i++) {
- var user = users.List[i];
- $("#nutzerliste").append('<option value=' + user.String + '>' + user.String + '</option>');
- }
- $('#nutzerLoeschen').prop( "disabled", true );
+ var template = $('#tpl-list').html();
+ Mustache.parse(template); // optional, speeds up future uses
+ $("#nutzerliste").append( Mustache.render(template, resp) );
}
function um_clear_user_form() {
@@ -160,25 +198,24 @@
return roleId;
}
-// {"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>');
- }
+
+ var template = $('#tpl-list').html();
+ Mustache.parse(template); // optional, speeds up future uses
+ $("#nutzerrollen").append( Mustache.render(template, resp) );
+
$('#nutzerRolleEntziehen').prop( "disabled", true );
+ $('#rolleErteilen').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 );
+
+ var template = $('#tpl-list').html();
+ Mustache.parse(template); // optional, speeds up future uses
+ $("#rollen").append( Mustache.render(template, resp) );
+
$('#rolleErteilen').prop( "disabled", true );
}
@@ -195,9 +232,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,15 +285,15 @@
});
}
-// public UserRole grantRole(String userId, String roleName)
+// http]://example.com/um/api?c=de.uhilger.um.api.UserMgr&m=testmethode
function um_apicall_grant_role(userId, roleName, isNewRole) {
+ var ur = new UserRole(userId, roleName);
var m = 'grantRole';
var u = '../svc/' + m;
$.ajax({
url: u,
data: {
- p1: userId,
- p2: roleName
+ p: self.serialisieren(ur)
},
type: "POST",
dataType : "html",
@@ -277,13 +313,13 @@
}
function um_apicall_revoke_role(userId, roleName) {
+ var ur = new UserRole(userId, roleName);
var m = 'revokeRole';
var u = '../svc/' + m;
$.ajax({
url: u,
data: {
- p1: userId,
- p2: roleName
+ p: self.serialisieren(ur)
},
type: "POST",
dataType : "html",
@@ -299,7 +335,6 @@
});
}
-//public List getUserRoleNames(String userId)
function um_apicall_get_user_roles(userId) {
var m = 'getUserRoleNames';
var u = '../svc/' + m + '?p=' + userId;
@@ -308,7 +343,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 +362,6 @@
type: "GET",
dataType : "json",
success: function( resp ) {
- // Antwort in Liste anzeigen
um_show_role_list(resp);
},
error: function( xhr, status, errorThrown ) {
@@ -354,4 +387,9 @@
this.firstName = fn;
this.lastName = ln;
this.email = em;
+}
+
+function UserRole(u, r) {
+ this.userId = u;
+ this.role = r;
}
\ No newline at end of file
--
Gitblit v1.9.3