From ce8261f629a74e3cfd41457d78553186854a3119 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sun, 05 Feb 2017 16:38:50 +0000
Subject: [PATCH] Rollen des admin geaendert
---
src/java/de/uhilger/um/api/UserMgr.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index 24cf481..1399575 100644
--- a/src/java/de/uhilger/um/api/UserMgr.java
+++ b/src/java/de/uhilger/um/api/UserMgr.java
@@ -26,7 +26,6 @@
import de.uhilger.um.daten.User;
import de.uhilger.um.daten.UserData;
import de.uhilger.um.daten.UserRole;
-import de.uhilger.um.web.Initialiser;
import java.sql.Connection;
import java.util.List;
import java.util.Properties;
@@ -91,7 +90,7 @@
/** Mapper-Objekt fuer Benutzer */
private static final Record UserMapper = new GenericRecord(User.class);
/** Mapper-Objekt fuer Benutzerdaten */
- private static final Record UserDataMapper = new GenericRecord(UserData.class);
+ //private static final Record UserDataMapper = new GenericRecord(UserData.class);
/** Mapper-Objekt fuer Benutzerrollen */
private static final Record UserRoleMapper = new GenericRecord(UserRole.class);
@@ -112,9 +111,7 @@
}
public List getUserNameList() {
- String sql = getSql(SQL_GET_USER_NAME_LIST);
- logger.info(sql);
- return getDb().select(sql, UserDataMapper);
+ return removeHeadline(getDb().select(getSql(SQL_GET_USER_NAME_LIST), WITHOUT_BLOBS));
}
public User deleteUser(User user) {
@@ -140,15 +137,22 @@
}
public List getRoleNamesGranted() {
- return getDb().select(getSql(SQL_GET_ROLE_LIST), WITHOUT_BLOBS);
+ return removeHeadline(getDb().select(getSql(SQL_GET_ROLE_LIST), WITHOUT_BLOBS));
}
public List getUserRoleNames(String userId) {
- return getDb().select(getSql(SQL_GET_USER_ROLES), WITHOUT_BLOBS, userId);
+ return removeHeadline(getDb().select(getSql(SQL_GET_USER_ROLES), WITHOUT_BLOBS, userId));
}
/* ----------- Helfer ---- */
+ private List removeHeadline(List list) {
+ if(list != null && list.size() > 0) {
+ list.remove(0);
+ }
+ return list;
+ }
+
/**
* Ein benanntes SQL-Kommando ermitteln
* @param id Name des gewuenschten SQL-Kommandos
--
Gitblit v1.9.3