]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Rewrites:
authorRoland Häder <roland@mxchange.org>
Tue, 3 May 2016 15:25:29 +0000 (17:25 +0200)
committerRoland Haeder <roland@mxchange.org>
Wed, 4 May 2016 18:48:37 +0000 (20:48 +0200)
- moved a lot unrelated user-only methods to proper admin controller

Signed-off-by: Roland Häder <roland@mxchange.org>
src/java/org/mxchange/addressbook/beans/profile/AddressbookUserProfileWebRequestBean.java
src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java
src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestController.java
web/WEB-INF/templates/login/login_base.tpl
web/admin/user/admin_user_delete.xhtml
web/admin/user/admin_user_list.xhtml
web/admin/user/admin_user_show.xhtml
web/admin/user/admin_user_unlock.xhtml

index a5175559917c37c1057c51a5b950636fd881868f..abedbba9e0ede5726cf15cabb0f17e10487dd02a 100644 (file)
@@ -21,11 +21,11 @@ import javax.enterprise.context.RequestScoped;
 import javax.faces.view.facelets.FaceletException;
 import javax.inject.Inject;
 import javax.inject.Named;
+import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController;
+import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.model.user.User;
 import org.mxchange.jusercore.model.user.profilemodes.ProfileMode;
-import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController;
-import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController;
 
 /**
  * A web request bean for user profiles
@@ -113,4 +113,5 @@ public class AddressbookUserProfileWebRequestBean implements AddressbookUserProf
                return ((profileMode.equals(ProfileMode.PUBLIC)) ||
                                (this.loginController.isUserLoggedIn()) && (profileMode.equals(ProfileMode.MEMBERS)));
        }
+
 }
index f9afe94339adcffda4587175312f0b9ebc285f86..f6926f33a5177e66e5b072b484e963e1d8c20e09 100644 (file)
@@ -27,6 +27,7 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.addressbook.beans.contact.AddressbookContactWebSessionController;
+import org.mxchange.addressbook.beans.user.AddressbookAdminUserWebRequestController;
 import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController;
 import org.mxchange.jusercore.events.registration.RegisteredUserEvent;
 import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
@@ -53,7 +54,13 @@ public class AddressbookUserRegisterWebSessionBean implements AddressbookUserReg
        private static final long serialVersionUID = 47_828_986_719_691_592L;
 
        /**
-        * User controller
+        * Administrative user controller
+        */
+       @Inject
+       private AddressbookAdminUserWebRequestController adminUserController;
+
+       /**
+        * Contact controller
         */
        @Inject
        private AddressbookContactWebSessionController contactController;
index f5bde77c8e8216f69c9c8cc900a4dd224eea9bdf..6bb6877e3dde7da52b3e3f3eced8b25a98ac5e5c 100644 (file)
@@ -34,8 +34,12 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.addressbook.beans.contact.AddressbookContactWebSessionController;
 import org.mxchange.addressbook.beans.helper.AddressbookAdminWebRequestController;
+import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController;
 import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jcontacts.contact.ContactSessionBeanRemote;
 import org.mxchange.jusercore.container.login.UserLoginContainer;
+import org.mxchange.jusercore.events.login.UserLoggedInEvent;
+import org.mxchange.jusercore.events.registration.UserRegisteredEvent;
 import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent;
 import org.mxchange.jusercore.events.user.add.AdminUserAddedEvent;
 import org.mxchange.jusercore.events.user.update.AdminUpdatedUserDataEvent;
@@ -79,12 +83,22 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
        @Inject
        private AddressbookAdminWebRequestController adminHelper;
 
+       /**
+        * Remote user bean
+        */
+       private final ContactSessionBeanRemote contactBean;
+
        /**
         * Regular contact controller
         */
        @Inject
        private AddressbookContactWebSessionController contactController;
 
+       /**
+        * A list of all selectable contacts
+        */
+       private List<Contact> selectableContacts;
+
        /**
         * An event fired when the administrator has updated a new user
         */
@@ -108,11 +122,22 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
         */
        private List<User> userList;
 
+       /**
+        * Login bean (controller)
+        */
+       @Inject
+       private AddressbookUserLoginWebSessionController userLoginController;
+
        /**
         * User name
         */
        private String userName;
 
+       /**
+        * User name list
+        */
+       private List<String> userNameList;
+
        /**
         * User password (unencrypted from web form)
         */
@@ -123,6 +148,11 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
         */
        private String userPasswordRepeat;
 
+       /**
+        * A list of all public user profiles
+        */
+       private List<User> visibleUserList;
+
        /**
         * Default constructor
         */
@@ -134,6 +164,9 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
 
                        // Try to lookup
                        this.userBean = (UserSessionBeanRemote) context.lookup("java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N
+
+                       // Try to lookup
+                       this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/addressbook-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N
                } catch (final NamingException e) {
                        // Throw again
                        throw new FaceletException(e);
@@ -143,36 +176,87 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
        @Override
        public String addUser () {
                // Create new user instance
-               User localUser = new LoginUser();
+               User user = new LoginUser();
+
+               // As the form cannot validate the data (required="true"), check it here
+               if (this.getUserName() == null) {
+                       // Throw NPE
+                       throw new NullPointerException("userName is null"); //NOI18N
+               } else if (this.getUserName().isEmpty()) {
+                       // Is empty
+                       throw new IllegalArgumentException("userName is null"); //NOI18N
+               } else if (this.adminHelper.getContact() == null) {
+                       // No contact instance set, so test required fields: gender, first name and family name
+                       if (this.contactController.getGender() == null) {
+                               // Throw NPE again
+                               throw new NullPointerException("contactController.gender is null"); //NOI18N
+                       } else if (this.contactController.getFirstName() == null) {
+                               // ... and again
+                               throw new NullPointerException("contactController.firstName is null"); //NOI18N //NOI18N
+                       } else if (this.contactController.getFirstName().isEmpty()) {
+                               // ... and again
+                               throw new IllegalArgumentException("contactController.firstName is empty");
+                       } else if (this.contactController.getFamilyName() == null) {
+                               // ... and again
+                               throw new NullPointerException("contactController.familyName is null"); //NOI18N
+                       } else if (this.contactController.getFamilyName().isEmpty()) {
+                               // ... and again
+                               throw new IllegalArgumentException("contactController.familyName is empty"); //NOI18N //NOI18N
+                       } else if (this.contactController.getEmailAddress() == null) {
+                               // ... and again
+                               throw new NullPointerException("contactController.emailAddress is null");
+                       } else if (this.contactController.getEmailAddress().isEmpty()) {
+                               // ... and again
+                               throw new IllegalArgumentException("contactController.emailAddress is empty"); //NOI18N //NOI18N
+                       } else if (this.contactController.getEmailAddressRepeat() == null) {
+                               // ... and again
+                               throw new NullPointerException("contactController.emailAddressRepeat is null");
+                       } else if (this.contactController.getEmailAddressRepeat().isEmpty()) {
+                               // ... and again
+                               throw new IllegalArgumentException("contactController.emailAddressRepeat is empty"); //NOI18N //NOI18N
+                       } else if (!Objects.equals(this.contactController.getEmailAddress(), this.contactController.getEmailAddressRepeat())) {
+                               // Is not same email address
+                               throw new IllegalArgumentException("Both entered email addresses don't match.");
+                       }
+               }
 
                // Set user name, CONFIRMED and INVISIBLE
-               localUser.setUserName(this.getUserName());
-               localUser.setUserAccountStatus(UserAccountStatus.CONFIRMED);
-               localUser.setUserProfileMode(ProfileMode.INVISIBLE);
+               user.setUserName(this.getUserName());
+               user.setUserAccountStatus(UserAccountStatus.CONFIRMED);
+               user.setUserProfileMode(ProfileMode.INVISIBLE);
 
-               // Create contact instance
-               Contact contact = this.contactController.createContactInstance();
+               // Init instance
+               Contact contact;
+
+               // Is a contact instance in helper set?
+               if (this.adminHelper.getContact() instanceof Contact) {
+                       // Then use it for contact linking
+                       contact = this.adminHelper.getContact();
+               } else {
+                       // Create contact instance
+                       contact = this.contactController.createContactInstance();
+               }
 
                // Set contact in user
-               localUser.setUserContact(contact);
+               user.setUserContact(contact);
 
                // Init variable for password
                String password = null;
 
                // Is the user name or email address used already?
                // @TODO Add password length check
-               if (this.userController.isUserNameRegistered(localUser)) {
+               if (this.isUserNameRegistered(user)) {
                        // User name is already used
-                       throw new FaceletException(new UserNameAlreadyRegisteredException(localUser));
-               } else if (this.contactController.isEmailAddressRegistered(localUser.getUserContact())) {
+                       throw new FaceletException(new UserNameAlreadyRegisteredException(user));
+               } else if ((this.adminHelper.getContact() == null) && (this.contactController.isEmailAddressRegistered(user.getUserContact()))) {
                        // Email address is already used
-                       throw new FaceletException(new EmailAddressAlreadyRegisteredException(localUser));
+                       throw new FaceletException(new EmailAddressAlreadyRegisteredException(user));
                } else if ((this.getUserPassword() == null && (this.getUserPasswordRepeat() == null)) || ((this.getUserPassword().isEmpty()) && (this.getUserPasswordRepeat().isEmpty()))) {
                        // Empty password entered, then generate one
                        password = UserUtils.createRandomPassword(AddressbookUserWebSessionController.MINIMUM_PASSWORD_LENGTH);
                } else if (!this.isSamePasswordEntered()) {
                        // Both passwords don't match
-                       throw new FaceletException(new UserPasswordRepeatMismatchException(localUser));
+                       throw new FaceletException(new UserPasswordRepeatMismatchException(user));
                } else {
                        // Both match, so get it from this bean
                        password = this.getUserPassword();
@@ -183,14 +267,23 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
                assert (password.length() >= AddressbookUserWebSessionController.MINIMUM_PASSWORD_LENGTH) : "Password is not long enough."; //NOI18N
 
                // Encrypt password and set it
-               localUser.setUserEncryptedPassword(UserUtils.encryptPassword(password));
+               user.setUserEncryptedPassword(UserUtils.encryptPassword(password));
 
                // Init updated user instance
                User updatedUser = null;
 
                try {
                        // Now, that all is set, call EJB
-                       updatedUser = this.userBean.addUser(localUser);
+                       if (this.adminHelper.getContact() instanceof Contact) {
+                               // Link contact with this user
+                               updatedUser = this.userBean.linkUser(user);
+
+                               // Remove contact instance
+                               this.adminHelper.setContact(null);
+                       } else {
+                               // Add new contact
+                               updatedUser = this.userBean.addUser(user);
+                       }
                } catch (final UserNameAlreadyRegisteredException | EmailAddressAlreadyRegisteredException ex) {
                        // Throw again
                        throw new FaceletException(ex);
@@ -199,16 +292,84 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
                // Fire event
                this.addedUserEvent.fire(new AdminUserAddedEvent(updatedUser));
 
-               // Add user to local list
-               this.userList.add(updatedUser);
-
-               // Clear contact instance
-               this.contactController.clear();
+               // Clear this bean
+               this.clear();
 
                // Return to user list (for now)
                return "admin_list_user"; //NOI18N
        }
 
+       @Override
+       public void afterRegistrationEvent (final @Observes UserRegisteredEvent event) {
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminUserWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N
+
+               // event should not be null
+               if (null == event) {
+                       // Throw NPE
+                       throw new NullPointerException("event is null"); //NOI18N
+               } else if (event.getRegisteredUser() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("event.user is null"); //NOI18N
+               } else if (event.getRegisteredUser().getUserId() == null) {
+                       // userId is null
+                       throw new NullPointerException("event.user.userId is null"); //NOI18N
+               } else if (event.getRegisteredUser().getUserId() < 1) {
+                       // Not avalid id
+                       throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getRegisteredUser(), event.getRegisteredUser().getUserId())); //NOI18N
+               }
+
+               // Get user instance
+               User registeredUser = event.getRegisteredUser();
+
+               // Debug message
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminUserWebBean:afterRegistration: registeredUser={0}", registeredUser)); //NOI18N
+               // Add user to local list
+               this.userList.add(registeredUser);
+
+               // Is the account public?
+               if (Objects.equals(registeredUser.getUserProfileMode(), ProfileMode.PUBLIC)) {
+                       // Also add it to this list
+                       this.visibleUserList.add(registeredUser);
+               }
+
+               // Add user name and email address
+               this.addUserNameEmailAddress(registeredUser);
+
+               // Clear all data
+               this.clear();
+
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println("AdminUserWebBean:afterRegistration: EXIT!"); //NOI18N
+       }
+
+       @Override
+       public void afterUserLogin (final @Observes UserLoggedInEvent event) {
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminUserWebBean:afterUserLogin: event={0} - CALLED!", event)); //NOI18N
+
+               // event should not be null
+               if (null == event) {
+                       // Throw NPE
+                       throw new NullPointerException("event is null"); //NOI18N
+               } else if (event.getLoggedInUser() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("event.user is null"); //NOI18N
+               } else if (event.getLoggedInUser().getUserId() == null) {
+                       // userId is null
+                       throw new NullPointerException("event.user.userId is null"); //NOI18N
+               } else if (event.getLoggedInUser().getUserId() < 1) {
+                       // Not avalid id
+                       throw new IllegalArgumentException(MessageFormat.format("userId of user={0} is not valid: {1}", event.getLoggedInUser(), event.getLoggedInUser().getUserId())); //NOI18N
+               }
+
+               // Re-initialize list
+               this.visibleUserList = this.userBean.allMemberPublicVisibleUsers();
+
+               // Trace message
+               //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AdminUserWebBean:afterUserLogin: this.visibleUserList.size()={0} - EXIT!", this.visibleUserList.size())); //NOI18N
+       }
+
        @Override
        public void afterUserUpdatedPersonalData (@Observes final UpdatedUserPersonalDataEvent event) {
                // Check parameter
@@ -236,6 +397,12 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
                return Collections.unmodifiableList(this.userList);
        }
 
+       @Override
+       public List<User> allVisibleUsers () {
+               // Return it
+               return Collections.unmodifiableList(this.visibleUserList);
+       }
+
        @Override
        public String editUserData () {
                // Get user instance
@@ -253,7 +420,7 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
                        throw new NullPointerException("adminHelper.user.userId is null"); //NOI18N //NOI18N
                } else if (user.getUserId() < 1) {
                        // Invalid id
-                       throw new IllegalStateException(MessageFormat.format("adminHelper.user.userId={0} is invalid", user.getUserId()));
+                       throw new IllegalStateException(MessageFormat.format("adminHelper.user.userId={0} is invalid", user.getUserId())); //NOI18N //NOI18N
                } else if (this.getUserName() == null) {
                        // Not all required fields are set
                        throw new NullPointerException("this.userName is null"); //NOI18N
@@ -343,8 +510,110 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
         */
        @PostConstruct
        public void init () {
+               // Get full user name list for reducing EJB calls
+               this.userNameList = this.userBean.getUserNameList();
+
+               // Is the user logged-in?
+               if (this.userLoginController.isUserLoggedIn()) {
+                       // Is logged-in, so load also users visible to memebers
+                       this.visibleUserList = this.userBean.allMemberPublicVisibleUsers();
+               } else {
+                       // Initialize user list
+                       this.visibleUserList = this.userBean.allPublicUsers();
+               }
+
                // Initialize user list
                this.userList = this.userBean.allUsers();
+
+               // Get full user name list for reducing EJB calls
+               this.userNameList = this.userBean.getUserNameList();
+
+               // Is the user logged-in?
+               if (this.userLoginController.isUserLoggedIn()) {
+                       // Is logged-in, so load also users visible to memebers
+                       this.visibleUserList = this.userBean.allMemberPublicVisibleUsers();
+               } else {
+                       // Initialize user list
+                       this.visibleUserList = this.userBean.allPublicUsers();
+               }
+
+               // Get all contacts
+               List<Contact> allContacts = this.contactController.allContacts();
+
+               // Get iterator
+               Iterator<Contact> iterator = allContacts.iterator();
+
+               // Loop through it
+               while (iterator.hasNext()) {
+                       // Get next element
+                       Contact next = iterator.next();
+
+                       // Get iterator
+                       Iterator<User> userIterator = this.userList.iterator();
+
+                       // Loop through all users
+                       while (userIterator.hasNext()) {
+                               // Get user instance
+                               User nextUser = userIterator.next();
+
+                               // Is contact same?
+                               if (Objects.equals(next, nextUser.getUserContact())) {
+                                       // Found same
+                                       iterator.remove();
+                                       break;
+                               }
+                       }
+               }
+
+               // Set contact list
+               this.selectableContacts = allContacts;
+       }
+
+       @Override
+       public boolean isContactFound (final Contact contact) {
+               // The contact must be valid
+               if (null == contact) {
+                       // Throw NPE
+                       throw new NullPointerException("contact is null"); //NOI18N
+               } else if (contact.getContactId() == null) {
+                       // Throw again ...
+                       throw new NullPointerException("contact.contactId is null"); //NOI18N
+               } else if (contact.getContactId() < 1) {
+                       // Not valid
+                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N
+               }
+
+               // Default is not found
+               boolean isFound = false;
+
+               // Get iterator
+               Iterator<User> iterator = this.allUsers().iterator();
+
+               // Loop through all entries
+               while (iterator.hasNext()) {
+                       // Get user
+                       User next = iterator.next();
+
+                       // Compare both objects
+                       if (Objects.equals(contact, next.getUserContact())) {
+                               // Found it
+                               isFound = true;
+                               break;
+                       }
+               }
+
+               // Return status
+               return isFound;
+       }
+
+       @Override
+       public boolean isUserNameRegistered (final User user) {
+               return ((this.userNameList instanceof List) && (this.userNameList.contains(user.getUserName())));
+       }
+
+       @Override
+       public boolean isVisibleUserFound () {
+               return ((this.visibleUserList instanceof List) && (this.visibleUserList.size() > 0));
        }
 
        @Override
@@ -384,13 +653,9 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
                return user;
        }
 
-       /**
-        * Checks if same password is entered and that they are not empty.
-        * <p>
-        * @return Whether the same password was entered
-        */
-       private boolean isSamePasswordEntered () {
-               return ((!this.getUserPassword().isEmpty()) && (Objects.equals(this.getUserPassword(), this.getUserPasswordRepeat())));
+       @Override
+       public List<Contact> selectableContacts () {
+               return Collections.unmodifiableList(this.selectableContacts);
        }
 
        /**
@@ -398,7 +663,8 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
         * <p>
         * @param user User instance
         */
-       private void updateList (final User user) {
+       @Override
+       public void updateList (final User user) {
                // The user should be valid
                if (null == user) {
                        // Throw NPE
@@ -431,4 +697,47 @@ public class AddressbookAdminUserWebRequestBean implements AddressbookAdminUserW
                this.userList.add(user);
        }
 
+       /**
+        * Adds user's name and email address to bean's internal list. It also
+        * updates the public user list if the user has decided to ha   }
+        * <p>
+        * @param user User instance
+        */
+       private void addUserNameEmailAddress (final User user) {
+               // Make sure the entry is not added yet
+               if (this.userNameList.contains(user.getUserName())) {
+                       // Abort here
+                       throw new IllegalArgumentException(MessageFormat.format("User name {0} already added.", user.getUserName())); //NOI18N
+               } else if (this.contactController.isEmailAddressRegistered(user.getUserContact())) {
+                       // Already added
+                       throw new IllegalArgumentException(MessageFormat.format("Email address {0} already added.", user.getUserContact().getContactEmailAddress())); //NOI18N
+               }
+
+               // Add user name
+               this.userNameList.add(user.getUserName());
+
+               // Add email addres
+               this.contactController.addEmailAddress(user.getUserContact().getContactEmailAddress());
+       }
+
+       /**
+        * Clears this bean
+        */
+       private void clear () {
+               // Clear all data
+               // - other data
+               this.setUserName(null);
+               this.setUserPassword(null);
+               this.setUserPasswordRepeat(null);
+       }
+
+       /**
+        * Checks if same password is entered and that they are not empty.
+        * <p>
+        * @return Whether the same password was entered
+        */
+       private boolean isSamePasswordEntered () {
+               return ((!this.getUserPassword().isEmpty()) && (Objects.equals(this.getUserPassword(), this.getUserPasswordRepeat())));
+       }
+
 }
index 599be4e3c004888362c5cbba40305e47de85cd3c..42bbe24f6970dd3ed28b2446f7f49d0bf061f063 100644 (file)
@@ -18,6 +18,7 @@ package org.mxchange.addressbook.beans.user;
 
 import java.io.Serializable;
 import java.util.List;
+import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jusercore.events.user.update.UpdatedUserPersonalDataEvent;
 import org.mxchange.jusercore.exceptions.UserNotFoundException;
 import org.mxchange.jusercore.model.user.User;
@@ -36,6 +37,54 @@ public interface AddressbookAdminUserWebRequestController extends Serializable {
         */
        void afterUserUpdatedPersonalData (final UpdatedUserPersonalDataEvent event);
 
+       /**
+        * All public user profiles
+        * <p>
+        * @return A list of all public user profiles
+        */
+       List<User> allVisibleUsers ();
+
+       /**
+        * Returns a list of all selectable contacts for user creation. Contacts
+        * from already existing users are excluded in this list.
+        * <p>
+        * @return A list of all selectable contacts
+        */
+       List<Contact> selectableContacts ();
+
+       /**
+        * Updates list with given user
+        * <p>
+        * @param user User to update
+        */
+       void updateList (final User user);
+
+       /**
+        * Checks whether the given contact is a user
+        * <p>
+        * @param contact Contact to check
+        * <p>
+        * @return Whether the contact is a user
+        */
+       boolean isContactFound (final Contact contact);
+
+       /**
+        * Checks whether a public user account is registered. This means that at
+        * least one user profile has its flag "public user profile" enabled.
+        * <p>
+        * @return Whether at least one user has a public profile
+        */
+       boolean isVisibleUserFound ();
+
+       /**
+        * Checks whether given user instance's name is used
+        * <p>
+        * @param user User instance's name to check
+        * <p>
+        * @return Whether it is already used
+        */
+       boolean isUserNameRegistered (final User user);
+
        /**
         * Tries to lookup user by given id number. If the user is not found or the
         * account status is not CONFIRMED proper exceptions are thrown.
index 0a2d405d1aa216e6173319b680f801aa5400eda9..dafc778692108fb3ae5f4c43c7fe87dc1a97f7f4 100644 (file)
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-<<<<<<< HEAD
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html">
 
@@ -20,9 +19,4 @@
        <ui:define name="footer">
                <ui:include id="footer" class="login_footer" src="/WEB-INF/templates/login/login_footer.tpl" />
        </ui:define>
-=======
-       xmlns:ui="http://java.sun.com/jsf/facelets">
-
-       <ui:define name="title">Benutzerbereich - <ui:insert name="login_title" class="login_title" /></ui:define>
->>>>>>> b5abdb2... added initial login templates and navigation rules
 </ui:composition>
index 0fdcb19947c3ad782deec6f2e934d02d5b8c7027..720c9033efa056f05a38d7bb9ac905c8cd14e2fc 100644 (file)
@@ -10,6 +10,7 @@
 
        <f:metadata>
                <f:viewParam name="userId" value="#{adminHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+               <f:viewAction action="#{adminHelper.copyUserToController()}" />
        </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
index de99760136709adfc5faf105022c78696f64b4d7..bbed8b885d0452f43f804b1e1fcd1dd2fb0f72b6 100644 (file)
                                                #{msg.ADMIN_ADD_USER_TITLE}
                                        </div>
 
+                                       <div class="para">
+                                               <fieldset id="user_contact">
+                                                       <legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}</legend>
+
+                                                       <div class="table_row">
+                                                               <div class="table_left_medium">
+                                                                       <h:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
+                                                               </div>
+
+                                                               <div class="table_right_medium">
+                                                                       <h:selectOneMenu class="select" id="userContact" value="#{adminHelper.contact}" converter="ContactConverter">
+                                                                               <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+                                                                               <f:selectItems value="#{adminUserController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactGender.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
+                                                                       </h:selectOneMenu>
+                                                               </div>
+
+                                                               <div class="clear"></div>
+                                                       </div>
+                                               </fieldset>
+                                       </div>
+
+                                       <div class="para">
+                                               <h:outputText value="#{msg.ADMIN_ADD_USER_OR_ENTER_CONTACT_DATA}" />
+                                       </div>
+
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
 
                                        <div class="table_footer">
index 98d5d702efdceaa4c936c3d72fed03628862d6a3..927dfc9b74ad1f63eee940d94f4ad2454af3fed1 100644 (file)
@@ -10,6 +10,7 @@
 
        <f:metadata>
                <f:viewParam name="userId" value="#{adminHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+               <f:viewAction action="#{adminHelper.copyUserToController()}" />
        </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
index fe96f5512baed7fceab3e970ce1e017cb8e154d7..7b33fdaa463d22fbcf5b7ac0420c18115b2b0b74 100644 (file)
@@ -10,6 +10,7 @@
 
        <f:metadata>
                <f:viewParam name="userId" value="#{adminHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+               <f:viewAction action="#{adminHelper.copyUserToController()}" />
        </f:metadata>
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">