No commit message

No commit message

uCC/ucc.database/src/main/java/org/universAAL/ucc/database/aalspace/DataAccessImpl.java

@@ -131,7 +131,8 @@ public class DataAccessImpl implements DataAccess{
 		if(instance.equals("User")) {
 			List<User> users = pAgent.getAllUsers();
 			for(User ur : users) {
-				roles.add((String)ur.getProperty(Activator.USER_SPACE+"userRole"));
+				if(ur != null && (String)ur.getProperty(Activator.USER_SPACE+"userRole") != null)
+					roles.add((String)ur.getProperty(Activator.USER_SPACE+"userRole"));
 			}
 			for(User u : users) {
 				String filter = ((String)u.getProperty(Activator.USER_SPACE+"username")).replace("_", " ");

uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewPersonController.java

@@ -133,7 +133,8 @@ public class AddNewPersonController implements Button.ClickListener, Window.Clos
 				box.setDescription(enumObj.getDescription());
 				// Create ComboBox with enum objects and add to form
 				for (String item : enumObj.getValues()) {
-					box.addItem(item);
+//					if(item != null)
+						box.addItem(item);
 				}
 				box.setImmediate(true);
 				if (enumObj.isRequired()) {

uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/UccUI.java

@@ -196,9 +196,10 @@ public class UccUI extends Application {
 				pwd.setValue(u.getPassword());
 			}
 		}
-		} else {
-			getMainWindow().showNotification(res.getString("create.account"), Notification.TYPE_HUMANIZED_MESSAGE);
-		}
+		} 
+//		else {
+//			getMainWindow().showNotification(res.getString("create.account"), Notification.TYPE_HUMANIZED_MESSAGE);
+//		}
 		login = new Button(res.getString("login.label"));
 		hl.addComponent(login);
 		hl.setComponentAlignment(login, Alignment.BOTTOM_RIGHT);