From b47ad995a65ba9cccd7fe2b7f889a4e83bbb11cb Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 7 Sep 2017 16:55:27 +0200 Subject: [client/server] remove GUEST_USER from netshares * added some sanity checks before adding a new network share in the table * added user feedback error message for invalid input * fixed text fields growing/shrinking depending on input --- .../src/main/java/org/openslx/bwlp/sat/web/WebServer.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'dozentenmodulserver/src/main/java') diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java index 111578d3..0975a443 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java @@ -204,9 +204,8 @@ public class WebServer extends NanoHTTPD { } // TODO format expected from the client-side to // handle different types of login. Currently: - // * no username nor password => use credentials of logged in user - // * username set, no password => guest mode - // * username and password set => user-specificed credentials + // * no username, no password => use credentials of logged in user + // * username and optional password => user-specified credentials StringBuilder sb = new StringBuilder(); if (!list.isEmpty()) { for (NetShare share : list) { @@ -214,11 +213,7 @@ public class WebServer extends NanoHTTPD { if (share.auth == NetShareAuth.LOGIN_USER) { // nothing to do } - if (share.auth == NetShareAuth.GUEST_USER) { - sb.append(' '); - sb.append(share.username); - } - if (share.auth == NetShareAuth.SPECIAL_USER) { + if (share.auth == NetShareAuth.OTHER_USER) { sb.append(' '); sb.append(share.username); sb.append(' '); -- cgit v1.2.3-55-g7522