Please cherry-pick:

- got rid of admin-contact-links menu template
- reformatted a lot templates
- got rid of some core:outputMessageBox as p:growl does it already
- implemented missing deleteContactData() action method
- also implemented missing even observer for updating cache and list
- replaced FaceletException with FacesException
- renamed variables

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
index 3d007ad59692e35dd9bfab8311f1a2be2e507e6a..728edaf4624168fa13617362672337ba12d19359 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java
@@ -23,15 +23,18 @@ import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Event;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Any;
-import javax.faces.view.facelets.FaceletException;
+import javax.faces.FacesException;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent;
 import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
 import org.mxchange.jcontacts.events.contact.created.ObservableCreatedContactEvent;
+import org.mxchange.jcontacts.events.contact.deleted.AdminDeletedContactEvent;
+import org.mxchange.jcontacts.events.contact.deleted.ObservableAdminDeletedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 import org.mxchange.jcontacts.exceptions.ContactAlreadyAddedException;
+import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
 import org.mxchange.jcontacts.model.contact.AdminContactSessionBeanRemote;
 import org.mxchange.jcontacts.model.contact.Contact;
 import org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote;
@@ -97,6 +100,11 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs
         */
        private String comment;
 
+       /**
+        * Current contact instance
+        */
+       private Contact contact;
+
        /**
         * EJB for general contact purposes
         */
@@ -125,6 +133,13 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs
        @Inject
        private JobsContactListWebViewController contactListController;
 
+       /**
+        * Event being fired when an administrator has deleted a contact
+        */
+       @Any
+       @Inject
+       private Event<ObservableAdminDeletedContactEvent> deletedContactEvent;
+
        /**
         * Email address
         */
@@ -274,12 +289,12 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs
                }
 
                // Create new contact instance
-               final Contact contact = this.createContactInstance();
+               final Contact createdContact = this.createContactInstance();
 
                // Default is not same contact
-               if (this.contactListController.isContactFound(contact)) {
+               if (this.contactListController.isContactFound(createdContact)) {
                        // Already registered
-                       throw new FaceletException(new ContactAlreadyAddedException(contact));
+                       throw new FacesException(new ContactAlreadyAddedException(createdContact));
                }
 
                // Init contact
@@ -288,10 +303,10 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs
                // Try to call EJB
                try {
                        // Call EJB
-                       updatedContact = this.adminContactBean.addContact(contact);
+                       updatedContact = this.adminContactBean.addContact(createdContact);
                } catch (final ContactAlreadyAddedException ex) {
                        // Throw again
-                       throw new FaceletException(ex);
+                       throw new FacesException(ex);
                }
 
                // Fire event
@@ -326,49 +341,52 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs
                        throw new IllegalStateException(MessageFormat.format("event.createdContact.contactId={0} is not valid.", event.getCreatedContact().getContactId())); //NOI18N
                }
 
+               // Set contact for e.g. delete method
+               this.setContact(event.getCreatedContact());
+
                // Get contact instance from event
-               final Contact contact = event.getCreatedContact();
+               final Contact createdContact = event.getCreatedContact();
 
                // Set all fields: contact
-               this.setContactId(contact.getContactId());
-               this.setAcademicTitle(contact.getContactTitle());
-               this.setBirthday(contact.getContactBirthday());
-               this.setCity(contact.getContactCity());
-               this.setComment(contact.getContactComment());
-               this.setContactCountry(contact.getContactCountry());
-               this.setEmailAddress(contact.getContactEmailAddress());
-               this.setFamilyName(contact.getContactFamilyName());
-               this.setFirstName(contact.getContactFirstName());
-               this.setPersonalTitle(contact.getContactPersonalTitle());
-               this.setHouseNumber(contact.getContactHouseNumber());
-               this.setHouseNumberExtension(contact.getContactHouseNumberExtension());
-               this.setStreet(contact.getContactStreet());
-               this.setZipCode(contact.getContactZipCode());
+               this.setContactId(createdContact.getContactId());
+               this.setAcademicTitle(createdContact.getContactTitle());
+               this.setBirthday(createdContact.getContactBirthday());
+               this.setCity(createdContact.getContactCity());
+               this.setComment(createdContact.getContactComment());
+               this.setContactCountry(createdContact.getContactCountry());
+               this.setEmailAddress(createdContact.getContactEmailAddress());
+               this.setFamilyName(createdContact.getContactFamilyName());
+               this.setFirstName(createdContact.getContactFirstName());
+               this.setPersonalTitle(createdContact.getContactPersonalTitle());
+               this.setHouseNumber(createdContact.getContactHouseNumber());
+               this.setHouseNumberExtension(createdContact.getContactHouseNumberExtension());
+               this.setStreet(createdContact.getContactStreet());
+               this.setZipCode(createdContact.getContactZipCode());
 
                // Is the cell phone set?
-               if (contact.getContactMobileNumber() instanceof DialableMobileNumber) {
+               if (createdContact.getContactMobileNumber() instanceof DialableMobileNumber) {
                        // ... cmobile data
-                       this.setMobileId(contact.getContactMobileNumber().getMobileId());
-                       this.setMobileProvider(contact.getContactMobileNumber().getMobileProvider());
-                       this.setMobileNumber(contact.getContactMobileNumber().getMobileNumber());
+                       this.setMobileId(createdContact.getContactMobileNumber().getMobileId());
+                       this.setMobileProvider(createdContact.getContactMobileNumber().getMobileProvider());
+                       this.setMobileNumber(createdContact.getContactMobileNumber().getMobileNumber());
                }
 
                // Is the fax set?
-               if (contact.getContactFaxNumber() instanceof DialableFaxNumber) {
+               if (createdContact.getContactFaxNumber() instanceof DialableFaxNumber) {
                        // ... fax data
-                       this.setFaxId(contact.getContactFaxNumber().getPhoneId());
-                       this.setFaxAreaCode(contact.getContactFaxNumber().getPhoneAreaCode());
-                       this.setFaxCountry(contact.getContactFaxNumber().getPhoneCountry());
-                       this.setFaxNumber(contact.getContactFaxNumber().getPhoneNumber());
+                       this.setFaxId(createdContact.getContactFaxNumber().getPhoneId());
+                       this.setFaxAreaCode(createdContact.getContactFaxNumber().getPhoneAreaCode());
+                       this.setFaxCountry(createdContact.getContactFaxNumber().getPhoneCountry());
+                       this.setFaxNumber(createdContact.getContactFaxNumber().getPhoneNumber());
                }
 
                // Is the land-line number set?
-               if (contact.getContactLandLineNumber() instanceof DialableLandLineNumber) {
+               if (createdContact.getContactLandLineNumber() instanceof DialableLandLineNumber) {
                        // .. land-line data
-                       this.setLandLineId(contact.getContactLandLineNumber().getPhoneId());
-                       this.setLandLineAreaCode(contact.getContactLandLineNumber().getPhoneAreaCode());
-                       this.setLandLineCountry(contact.getContactLandLineNumber().getPhoneCountry());
-                       this.setLandLineNumber(contact.getContactLandLineNumber().getPhoneNumber());
+                       this.setLandLineId(createdContact.getContactLandLineNumber().getPhoneId());
+                       this.setLandLineAreaCode(createdContact.getContactLandLineNumber().getPhoneAreaCode());
+                       this.setLandLineCountry(createdContact.getContactLandLineNumber().getPhoneCountry());
+                       this.setLandLineNumber(createdContact.getContactLandLineNumber().getPhoneNumber());
                }
 
                // Log message
@@ -401,23 +419,23 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs
                final DialableFaxNumber fax = new FaxNumber(this.getFaxCountry(), this.getFaxAreaCode(), this.getFaxNumber());
 
                // Create new instance
-               final Contact contact = new UserContact(this.getPersonalTitle(), this.getFirstName(), this.getFamilyName());
+               final Contact localContact = new UserContact(this.getPersonalTitle(), this.getFirstName(), this.getFamilyName());
 
                // Add all others
-               contact.setContactId(this.getContactId());
-               contact.setContactTitle(this.getAcademicTitle());
-               contact.setContactBirthday(this.getBirthday());
-               contact.setContactStreet(this.getStreet());
-               contact.setContactHouseNumber(this.getHouseNumber());
-               contact.setContactZipCode(this.getZipCode());
-               contact.setContactCity(this.getCity());
-               contact.setContactCountry(this.getContactCountry());
-               contact.setContactEmailAddress(this.getEmailAddress());
-               contact.setContactBirthday(this.getBirthday());
-               contact.setContactComment(this.getComment());
+               localContact.setContactId(this.getContactId());
+               localContact.setContactTitle(this.getAcademicTitle());
+               localContact.setContactBirthday(this.getBirthday());
+               localContact.setContactStreet(this.getStreet());
+               localContact.setContactHouseNumber(this.getHouseNumber());
+               localContact.setContactZipCode(this.getZipCode());
+               localContact.setContactCity(this.getCity());
+               localContact.setContactCountry(this.getContactCountry());
+               localContact.setContactEmailAddress(this.getEmailAddress());
+               localContact.setContactBirthday(this.getBirthday());
+               localContact.setContactComment(this.getComment());
 
                // Set ownContact
-               contact.setContactOwnContact(Boolean.TRUE);
+               localContact.setContactOwnContact(Boolean.TRUE);
 
                // Don't set null or wrong references
                if ((landLine instanceof DialableLandLineNumber) && (landLine.getPhoneCountry() instanceof Country) && (this.getLandLineAreaCode() != null) && (this.getLandLineNumber() != null) && (this.getLandLineAreaCode() > 0) && (this.getLandLineNumber() > 0)) {
@@ -437,7 +455,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs
                        }
 
                        // Set phone number
-                       contact.setContactLandLineNumber(landLine);
+                       localContact.setContactLandLineNumber(landLine);
                }
 
                // Don't set null or wrong references
@@ -458,7 +476,7 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs
                        }
 
                        // Set fax number
-                       contact.setContactFaxNumber(fax);
+                       localContact.setContactFaxNumber(fax);
                }
 
                // Is the provider set?
@@ -473,11 +491,44 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs
                        }
 
                        // Set cmobile number
-                       contact.setContactMobileNumber(mobile);
+                       localContact.setContactMobileNumber(mobile);
                }
 
                // Return it
-               return contact;
+               return localContact;
+       }
+
+       /**
+        * Deletes currently chosen contact and returns to list view
+        *
+        * @return
+        */
+       public String deleteContactData () {
+               // Is contact set?
+               if (this.getContact() == null) {
+                       // Throw NPE
+                       throw new NullPointerException("this.contact is null");
+               } else if (this.getContact().getContactId() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("this.contact.contactId is null");
+               } else if (this.getContact().getContactId() < 1) {
+                       // Throw IAE
+                       throw new NullPointerException(MessageFormat.format("this.contact.contactId={0} is not valid.", this.getContact().getContactId()));
+               }
+
+               try {
+                       // Invoke EJB
+                       this.adminContactBean.deleteContactData(this.getContact());
+               } catch (final ContactNotFoundException ex) {
+                       // Throw it again
+                       throw new FacesException(ex);
+               }
+
+               // Fire event
+               this.deletedContactEvent.fire(new AdminDeletedContactEvent(this.getContact()));
+
+               // Return to list view
+               return "admin_list_contact";
        }
 
        /**
@@ -485,25 +536,25 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs
         */
        public void editContactData () {
                // Get contact instance
-               final Contact contact = this.createContactInstance();
+               final Contact createdContact = this.createContactInstance();
 
                // Check if contact instance is in helper and valid
-               if (null == contact) {
+               if (null == createdContact) {
                        // Throw NPE
                        throw new NullPointerException("beanHelper.contact is null"); //NOI18N
-               } else if (contact.getContactId() == null) {
+               } else if (createdContact.getContactId() == null) {
                        // Throw NPE again
                        throw new NullPointerException("beanHelper.contact.contactId is null"); //NOI18N //NOI18N
-               } else if (contact.getContactId() < 1) {
+               } else if (createdContact.getContactId() < 1) {
                        // Invalid id
-                       throw new IllegalStateException(MessageFormat.format("beanHelper.contact.contactId={0} is invalid", contact.getContactId())); //NOI18N
+                       throw new IllegalStateException(MessageFormat.format("beanHelper.contact.contactId={0} is invalid", createdContact.getContactId())); //NOI18N
                }
 
                // Update all data in contact
-               this.updateContactData(contact);
+               this.updateContactData(createdContact);
 
                // Call EJB for updating contact data
-               final Contact updatedContact = this.contactBean.updateContactData(contact, this.isMobileNumberUnlinked, this.isLandLineUnlinked, this.isFaxUnlinked);
+               final Contact updatedContact = this.contactBean.updateContactData(createdContact, this.isMobileNumberUnlinked, this.isLandLineUnlinked, this.isFaxUnlinked);
 
                // Fire event
                this.updatedContactEvent.fire(new AdminUpdatedContactEvent(updatedContact));
@@ -639,6 +690,24 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs
                this.comment = comment;
        }
 
+       /**
+        * Getter for contact instance
+        * <p>
+        * @return Contact instance
+        */
+       public Contact getContact () {
+               return this.contact;
+       }
+
+       /**
+        * Setter for contact instance
+        * <p>
+        * @param contact Contact instance
+        */
+       public void setContact (final Contact contact) {
+               this.contact = contact;
+       }
+
        /**
         * Getter for contactCountry instance
         * <p>
@@ -1054,6 +1123,8 @@ public class JobsAdminContactWebRequestBean extends BaseJobsBean implements Jobs
         */
        private void clear () {
                // Clear all data
+               this.setContact(null);
+
                // - personal data
                this.setAcademicTitle(null);
                this.setFirstName(null);

diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java
index 7e8a668725af502578d743f2b15fb53f13c94fdd..d9e62b7617bf5e450483074bc6c04aed68808a3a 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/JobsContactWebRequestBean.java
@@ -22,8 +22,8 @@ import java.util.Objects;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Observes;
+import javax.faces.FacesException;
 import javax.faces.application.FacesMessage;
-import javax.faces.view.facelets.FaceletException;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcontacts.model.contact.Contact;
@@ -308,7 +308,7 @@ public class JobsContactWebRequestBean extends BaseJobsBean implements JobsConta
                // Is all required data set?
                if (!this.isRequiredPersonalDataSet()) {
                        // No, then abort here
-                       throw new FaceletException(new IllegalArgumentException("Not all personal data is set, but createContactInstance() is called.")); //NOI18N
+                       throw new FacesException(new IllegalArgumentException("Not all personal data is set, but createContactInstance() is called.")); //NOI18N
                }
 
                // Required personal data must be set
@@ -333,7 +333,7 @@ public class JobsContactWebRequestBean extends BaseJobsBean implements JobsConta
                        throw new IllegalStateException("User is not logged-in"); //NOI18N
                } else if (!this.isRequiredChangePersonalDataSet()) {
                        // Not all required fields are set
-                       throw new FaceletException("Not all required fields are set."); //NOI18N
+                       throw new FacesException("Not all required fields are set."); //NOI18N
                } else if (!this.userLoginController.ifCurrentPasswordMatches()) {
                        // Password not matching
                        this.showFacesMessage("form_login_change_personal:currentPassword", new UserPasswordMismatchException(this.userLoginController.getLoggedInUser()), FacesMessage.SEVERITY_ERROR); //NOI18N

diff --git a/src/java/org/mxchange/jjobs/beans/contact/list/JobsContactListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/contact/list/JobsContactListWebViewBean.java
index 0cd3e999e376732ea06c75b0ff99114c77b0e0e6..5c8b19a1e472d90bd546427a542b7f4303264f6e 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/list/JobsContactListWebViewBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/list/JobsContactListWebViewBean.java
@@ -30,6 +30,7 @@ import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent;
+import org.mxchange.jcontacts.events.contact.deleted.ObservableAdminDeletedContactEvent;
 import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent;
 import org.mxchange.jcontacts.events.fax.unlinked.ObservableAdminUnlinkedFaxNumberEvent;
 import org.mxchange.jcontacts.events.landline.unlinked.ObservableAdminUnlinkedLandLineNumberEvent;
@@ -123,6 +124,32 @@ public class JobsContactListWebViewBean extends BaseJobsBean implements JobsCont
                this.uniqueAddContact(event.getAddedContact());
        }
 
+       /**
+        * Event observer for when an administrator has deleted a contact
+        * <p>
+        * @param event Event being fired
+        */
+       public void afterAdminDeletedContactEvent (@Observes final ObservableAdminDeletedContactEvent event) {
+               // Validate parameter
+               if (null == event) {
+                       // Throw NPE
+                       throw new NullPointerException("event is null"); //NOI18N
+               } else if (event.getDeletedContact() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("event.deletedContact is null"); //NOI18N
+               } else if (event.getDeletedContact().getContactId() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("event.deletedContact.contactId is null"); //NOI18N
+               } else if (event.getDeletedContact().getContactId() < 1) {
+                       // Throw IAE
+                       throw new IllegalArgumentException(MessageFormat.format("event.deletedContact.contactId={0} is not valid.", event.getDeletedContact().getContactId())); //NOI18N
+               }
+
+               // Delete from cache and list
+               this.contactCache.remove(event.getDeletedContact().getContactId());
+               this.getAllContacts().remove(event.getDeletedContact());
+       }
+
        /**
         * Event observer for unlinked fax contact by administrators
         * <p>
@@ -311,7 +338,7 @@ public class JobsContactListWebViewBean extends BaseJobsBean implements JobsCont
                        throw new NullPointerException("contactId is null"); //NOI18N
                } else if (contactId < 1) {
                        // Throw IAE
-                       throw new IllegalArgumentException("contactId=" + contactId + " is invalid"); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("contactId={0} is invalid", contactId)); //NOI18N
                } else if (!this.contactCache.containsKey(contactId)) {
                        // Not found
                        throw new ContactNotFoundException(contactId);

diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/action/FinancialsUserActionWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/action/FinancialsUserActionWebRequestBean.java
index b47710e0abc657eb1efe2cffbea0dc6910eb5695..effde46a7966aa45664bb364e6636406df9101e7 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/contact/phone/action/FinancialsUserActionWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/contact/phone/action/FinancialsUserActionWebRequestBean.java
@@ -21,7 +21,7 @@ import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Event;
 import javax.enterprise.inject.Any;
-import javax.faces.view.facelets.FaceletException;
+import javax.faces.FacesException;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcontacts.model.contact.Contact;
@@ -105,10 +105,10 @@ public class FinancialsUserActionWebRequestBean extends BaseFinancialsBean imple
                        throw new IllegalStateException("User is not logged-in"); //NOI18N
                } else if (!this.contactController.isRequiredChangePersonalDataSet()) {
                        // Not all required fields are set
-                       throw new FaceletException("Not all required fields are set."); //NOI18N
+                       throw new FacesException("Not all required fields are set."); //NOI18N
                } else if (!this.userLoginController.ifCurrentPasswordMatches()) {
                        // Password not matching
-                       throw new FaceletException(new UserPasswordMismatchException(this.userLoginController.getLoggedInUser()));
+                       throw new FacesException(new UserPasswordMismatchException(this.userLoginController.getLoggedInUser()));
                } else if (!this.featureController.isFeatureEnabled("change_user_personal_data")) { //NOI18N
                        // Editing is not allowed
                        throw new IllegalStateException("User tried to edit personal data."); //NOI18N

diff --git a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java
index 7b3bdc1c4cfb7e8a4735758d20c65d9ce113f122..98a5a7c387808bb35b510189525e0d2a8961b5e5 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/country/JobsAdminCountryWebRequestBean.java
@@ -21,7 +21,7 @@ import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Event;
 import javax.enterprise.inject.Any;
-import javax.faces.view.facelets.FaceletException;
+import javax.faces.FacesException;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcountry.events.added.AdminAddedCountryEvent;
@@ -125,7 +125,7 @@ public class JobsAdminCountryWebRequestBean extends BaseJobsBean implements Jobs
                // Does it already exist?
                if (this.isCountryAdded(country)) {
                        // Yes, then abort here
-                       throw new FaceletException(new CountryAlreadyAddedException(country));
+                       throw new FacesException(new CountryAlreadyAddedException(country));
                }
 
                // Init variable
@@ -136,7 +136,7 @@ public class JobsAdminCountryWebRequestBean extends BaseJobsBean implements Jobs
                        updatedCountry = this.adminCountryBean.addCountry(country);
                } catch (final CountryAlreadyAddedException ex) {
                        // Throw again
-                       throw new FaceletException(ex);
+                       throw new FacesException(ex);
                }
 
                // Fire event

diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java
index bd3fccd70635d716ef0d4952f0e34db4ea2ba7c2..cc7067a88938e70a3e3260ce74666a8b91969414 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java
@@ -21,8 +21,8 @@ import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Event;
 import javax.enterprise.inject.Any;
+import javax.faces.FacesException;
 import javax.faces.application.FacesMessage;
-import javax.faces.view.facelets.FaceletException;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcountry.model.data.Country;
@@ -122,7 +122,7 @@ public class JobsAdminMobileProviderWebRequestBean extends BaseJobsBean implemen
                        updatedProvider = this.adminRemoteBean.addMobileProvider(mobileProvider);
                } catch (final MobileProviderAlreadyAddedException ex) {
                        // Throw again
-                       throw new FaceletException(ex);
+                       throw new FacesException(ex);
                }
 
                // Fire event

diff --git a/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java
index affc3e8d29a7028584922279370f205dc14196f2..a943ba2c55d58ef3ed7af31fb8ec2f5681d0ba67 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java
@@ -18,7 +18,7 @@ package org.mxchange.jjobs.beans.profile;
 
 import java.text.MessageFormat;
 import javax.enterprise.context.RequestScoped;
-import javax.faces.view.facelets.FaceletException;
+import javax.faces.FacesException;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jjobs.beans.BaseJobsBean;
@@ -72,7 +72,7 @@ public class JobsUserProfileWebRequestBean extends BaseJobsBean implements JobsU
                        user = this.userListController.lookupUserById(userId);
                } catch (final UserNotFoundException ex) {
                        // Throw again
-                       throw new FaceletException(ex);
+                       throw new FacesException(ex);
                }
 
                // Is it null?

diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
index f24d04377257ca38997c20f6a6d5cc696988dada..fb90141593521af674899712f8c1c922536a738a 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java
@@ -244,7 +244,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsBean implements JobsAdm
                // @TODO Add password length check
                if ((this.featureController.isFeatureEnabled("user_login_require_user_name")) && (this.userListController.isUserNameRegistered(newUser))) {
                        // User name is already used
-                       throw new FaceletException(new UserNameAlreadyRegisteredException(newUser));
+                       throw new FacesException(new UserNameAlreadyRegisteredException(newUser));
                } else if ((this.getContact() == null) && (this.contactController.isEmailAddressRegistered(newUser.getUserContact()))) {
                        // Email address is already used
                        this.showFacesMessage("admin_add_user:emailAddress", "ERROR_EMAIL_ADDRESS_ALREADY_USED", FacesMessage.SEVERITY_WARN); //NOI18N
@@ -274,7 +274,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsBean implements JobsAdm
                        }
                } catch (final UserNameAlreadyRegisteredException | EmailAddressAlreadyRegisteredException ex) {
                        // Throw again
-                       throw new FaceletException(ex);
+                       throw new FacesException(ex);
                }
 
                // Clear helper
@@ -361,7 +361,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsBean implements JobsAdm
                        this.adminUserBean.deleteUser(this.getUser(), this.getUserDeleteReason());
                } catch (final UserNotFoundException ex) {
                        // Should not happen, so throw again
-                       throw new FaceletException(ex);
+                       throw new FacesException(ex);
                }
 
                // Fire event
@@ -623,7 +623,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsBean implements JobsAdm
                        throw new FacesException(new UserStatusLockedException(this.getUser()));
                } else if (this.getUser().getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) {
                        // User account is locked
-                       throw new FaceletException(new UserStatusUnconfirmedException(this.getUser()));
+                       throw new FacesException(new UserStatusUnconfirmedException(this.getUser()));
                } else if (this.getUserLockReason() == null) {
                        // Throw NPE again
                        throw new NullPointerException("this.userLockReason is null"); //NOI18N
@@ -643,7 +643,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsBean implements JobsAdm
                        updatedUser = this.adminUserBean.lockUserAccount(this.getUser(), this.getUserLockReason(), baseUrl);
                } catch (final UserStatusLockedException | UserStatusUnconfirmedException | UserNotFoundException ex) {
                        // Throw again
-                       throw new FaceletException(ex);
+                       throw new FacesException(ex);
                }
 
                // Fire event
@@ -678,7 +678,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsBean implements JobsAdm
                        throw new FacesException(new UserStatusConfirmedException(this.getUser()));
                } else if (this.getUser().getUserAccountStatus() == UserAccountStatus.UNCONFIRMED) {
                        // User account is locked
-                       throw new FaceletException(new UserStatusUnconfirmedException(this.getUser()));
+                       throw new FacesException(new UserStatusUnconfirmedException(this.getUser()));
                }
 
                // Init updated user instance
@@ -692,7 +692,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsBean implements JobsAdm
                        updatedUser = this.adminUserBean.unlockUserAccount(this.getUser(), baseUrl);
                } catch (final UserStatusConfirmedException | UserStatusUnconfirmedException | UserNotFoundException ex) {
                        // Throw again
-                       throw new FaceletException(ex);
+                       throw new FacesException(ex);
                }
 
                // Fire event
@@ -740,7 +740,7 @@ public class JobsAdminUserWebRequestBean extends BaseJobsBean implements JobsAdm
                        password = UserLoginUtils.createRandomPassword(JobsUserWebRequestController.MINIMUM_PASSWORD_LENGTH);
                } else if (!this.isSamePasswordEntered()) {
                        // Both passwords don't match
-                       throw new FaceletException(new UserPasswordRepeatMismatchException());
+                       throw new FacesException(new UserPasswordRepeatMismatchException());
                } else {
                        // Both match, so get it from this bean
                        password = this.getUserPassword();

diff --git a/src/java/org/mxchange/jjobs/beans/user/confirmlink/JobsConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/confirmlink/JobsConfirmationLinkWebRequestBean.java
index e83ea21e10ecc6cdc8ba001e04fcb5b7d1b78132..34da8b172e13259cf5876df60eb27d8227f05b11 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/confirmlink/JobsConfirmationLinkWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/confirmlink/JobsConfirmationLinkWebRequestBean.java
@@ -22,7 +22,7 @@ import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Event;
 import javax.enterprise.inject.Any;
-import javax.faces.view.facelets.FaceletException;
+import javax.faces.FacesException;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcoreee.events.helper.clear.HelperCleanupEvent;
@@ -162,10 +162,10 @@ public class JobsConfirmationLinkWebRequestBean extends BaseJobsBean implements
                        throw new IllegalArgumentException(MessageFormat.format("userId is not valid: {0}", user.getUserId())); //NOI18N
                } else if (user.getUserAccountStatus() == UserAccountStatus.CONFIRMED) {
                        // Account is already confirmed
-                       throw new FaceletException(new UserStatusConfirmedException(user));
+                       throw new FacesException(new UserStatusConfirmedException(user));
                } else if (user.getUserAccountStatus() == UserAccountStatus.LOCKED) {
                        // Account is already confirmed
-                       throw new FaceletException(new UserStatusLockedException(user));
+                       throw new FacesException(new UserStatusLockedException(user));
                } else if (user.getUserConfirmKey() == null) {
                        // Throw NPE
                        throw new NullPointerException("user.userConfirmKey is null"); //NOI18N
@@ -185,7 +185,7 @@ public class JobsConfirmationLinkWebRequestBean extends BaseJobsBean implements
                        updatedUser = this.userBean.confirmAccount(user, baseUrl);
                } catch (final UserStatusConfirmedException | UserStatusLockedException ex) {
                        // Something unexpected happened
-                       throw new FaceletException(MessageFormat.format("Cannot confirm user account {0}", user.getUserName()), ex); //NOI18N
+                       throw new FacesException(MessageFormat.format("Cannot confirm user account {0}", user.getUserName()), ex); //NOI18N
                }
 
                // Fire event that the user has confirmed account

diff --git a/src/java/org/mxchange/jjobs/beans/user/email_address/JobsEmailChangeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/email_address/JobsEmailChangeWebRequestBean.java
index 31f1998b405b12a034fac8038588ae9d669371dd..519a869a792d43c5814af7dec76d1d0e10c450f2 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/email_address/JobsEmailChangeWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/email_address/JobsEmailChangeWebRequestBean.java
@@ -20,8 +20,8 @@ import java.text.MessageFormat;
 import java.util.Objects;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
+import javax.faces.FacesException;
 import javax.faces.application.FacesMessage;
-import javax.faces.view.facelets.FaceletException;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcontacts.model.contact.Contact;
@@ -106,7 +106,7 @@ public class JobsEmailChangeWebRequestBean extends BaseJobsBean implements JobsE
                        throw new IllegalStateException("User tried to change email address"); //NOI18N
                } else if (!this.isRequiredChangeEmailAddressSet()) {
                        // Not all required fields are set
-                       throw new FaceletException("Not all required fields are set."); //NOI18N
+                       throw new FacesException("Not all required fields are set."); //NOI18N
                } else if (!Objects.equals(this.getEmailAddress(), this.getEmailAddressRepeat())) {
                        // Email address 1+2 mismatch
                        this.showFacesMessage("form_user_change_email_address:emailAddressRepeat", "ERROR_USER_EMAIL_ADDRESSES_MISMATCH", FacesMessage.SEVERITY_WARN); //NOI18N

diff --git a/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java
index 22c28a8e6165f425053bd98dbb3dda6cfadf531c..be9c162449abae2d5c780abc43f18473877c3c36 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java
@@ -21,8 +21,8 @@ import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Event;
 import javax.enterprise.inject.Any;
+import javax.faces.FacesException;
 import javax.faces.application.FacesMessage;
-import javax.faces.view.facelets.FaceletException;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcoreee.utils.FacesUtils;
@@ -116,10 +116,10 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsBean implements Jobs
                        throw new IllegalStateException("User is not logged-in"); //NOI18N
                } else if (!this.isRequiredChangePasswordSet()) {
                        // Not all required fields are set
-                       throw new FaceletException("Not all required fields are set."); //NOI18N
+                       throw new FacesException("Not all required fields are set."); //NOI18N
                } else if (!this.userLoginController.ifCurrentPasswordMatches()) {
                        // Password not matching
-                       throw new FaceletException(new UserPasswordMismatchException(this.userLoginController.getLoggedInUser()));
+                       throw new FacesException(new UserPasswordMismatchException(this.userLoginController.getLoggedInUser()));
                } else if (!this.featureController.isFeatureEnabled("change_user_password")) { //NOI18N
                        // Editing is not allowed
                        throw new IllegalStateException("User tried to change password."); //NOI18N
@@ -184,7 +184,7 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsBean implements Jobs
                        this.clear();
 
                        // Throw again
-                       throw new FaceletException(ex);
+                       throw new FacesException(ex);
                }
 
                // Clear bean

diff --git a/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java
index 77d79963bf73e52723de4709d7c8a5a7856c12bc..fa9db99136cc6ab6569f6cc2a0f7d431ba2277cb 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java
@@ -22,8 +22,8 @@ import javax.enterprise.context.RequestScoped;
 import javax.enterprise.event.Event;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Any;
+import javax.faces.FacesException;
 import javax.faces.application.FacesMessage;
-import javax.faces.view.facelets.FaceletException;
 import javax.inject.Inject;
 import javax.inject.Named;
 import org.mxchange.jcontacts.model.contact.Contact;
@@ -173,7 +173,7 @@ public class JobsUserRegisterWebRequestBean extends BaseJobsBean implements Jobs
                // Is registration enabled?
                if (!this.featureController.isFeatureEnabled("user_registration")) { //NOI18N
                        // Is not enabled
-                       throw new FaceletException("Registration is disabled."); //NOI18N
+                       throw new FacesException("Registration is disabled."); //NOI18N
                }
 
                // Get user instance
@@ -188,12 +188,12 @@ public class JobsUserRegisterWebRequestBean extends BaseJobsBean implements Jobs
                        throw new NullPointerException("user is null after createUserInstance() was called"); //NOI18N
                } else if (!this.isRequiredPersonalDataSet()) {
                        // Not all required fields are set
-                       throw new FaceletException("Not all required fields are set."); //NOI18N
+                       throw new FacesException("Not all required fields are set."); //NOI18N
                } else if ((this.featureController.isFeatureEnabled("user_login_require_user_name")) && (this.userListController.isUserNameRegistered(user))) { //NOI18N
                        // Is multi-page enabled?
                        if (this.featureController.isFeatureEnabled("user_register_multiple_page")) { //NOI18N
                                // User name is already used, should not happen here
-                               throw new FaceletException(new UserNameAlreadyRegisteredException(user));
+                               throw new FacesException(new UserNameAlreadyRegisteredException(user));
                        } else {
                                // May happen here, clear user name
                                this.clearUserName();
@@ -206,7 +206,7 @@ public class JobsUserRegisterWebRequestBean extends BaseJobsBean implements Jobs
                        // Is multi-page enabled?
                        if (this.featureController.isFeatureEnabled("user_register_multiple_page")) { //NOI18N
                                // Email address has already been taken, should not happen here
-                               throw new FaceletException(new EmailAddressAlreadyRegisteredException(user));
+                               throw new FacesException(new EmailAddressAlreadyRegisteredException(user));
                        } else {
                                // May happen here, reset fields
                                this.contactController.clearEmailAddresses();
@@ -217,7 +217,7 @@ public class JobsUserRegisterWebRequestBean extends BaseJobsBean implements Jobs
                        // Is multi-page enabled?
                        if (this.featureController.isFeatureEnabled("user_register_multiple_page")) { //NOI18N
                                // Not same email address entered, should not happen here
-                               throw new FaceletException(new DataRepeatMismatchException("Email addresses not matching.")); //NOI18N
+                               throw new FacesException(new DataRepeatMismatchException("Email addresses not matching.")); //NOI18N
                        } else {
                                // May happen here, reset fields
                                this.contactController.clearEmailAddresses();
@@ -228,7 +228,7 @@ public class JobsUserRegisterWebRequestBean extends BaseJobsBean implements Jobs
                        // Is multi-page enabled?
                        if (this.featureController.isFeatureEnabled("user_register_multiple_page")) { //NOI18N
                                // Not same password entered, should no longer happen here
-                               throw new FaceletException(new DataRepeatMismatchException("Passwords not matching.")); //NOI18N
+                               throw new FacesException(new DataRepeatMismatchException("Passwords not matching.")); //NOI18N
                        } else if (this.ifBothPasswordsEmptyAllowed()) {
                                // Both passwords are left empty and is allowed, then generate a random password
                                randomPassword = UserLoginUtils.createRandomPassword(JobsUserWebRequestController.MINIMUM_PASSWORD_LENGTH);
@@ -279,7 +279,7 @@ public class JobsUserRegisterWebRequestBean extends BaseJobsBean implements Jobs
                        return "user_register_done"; //NOI18N
                } catch (final UserNameAlreadyRegisteredException | EmailAddressAlreadyRegisteredException ex) {
                        // Continue to throw
-                       throw new FaceletException(ex);
+                       throw new FacesException(ex);
                }
        }
 
@@ -294,7 +294,7 @@ public class JobsUserRegisterWebRequestBean extends BaseJobsBean implements Jobs
                // Is registration enabled?
                if (!this.featureController.isFeatureEnabled("user_registration")) { //NOI18N
                        // Is not enabled
-                       throw new FaceletException("Registration is disabled."); //NOI18N
+                       throw new FacesException("Registration is disabled."); //NOI18N
                }
 
                // Get user instance

diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties
index fd3b1e60eabab3ae97cb85e3dcbfee5e7566908f..a42bed7ab81ec4feb2b1abb612fd223979e645cf 100644 (file)
--- a/src/java/org/mxchange/localization/generic_de_DE.properties
+++ b/src/java/org/mxchange/localization/generic_de_DE.properties
@@ -1228,3 +1228,4 @@ BARCODE=Barcode:
 ADMIN_CONTACT_DETAILS_HEADER=Kontaktdaten zu {0} {1} {2}:
 ADMIN_DEPARTMENT_DETAILS_HEADER=Daten der Abteilung {0} (Id {1}):
 ADMIN_HEADQUARTER_DETAILS_HEADER=Haupstelle von {0} (Id {1})):
+ERROR_PARAMETER_CONFIRM_KEY_IS_NOT_SET=Fehler: Parameter "confirmationKey" ist nicht gesetzt.

diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties
index f1d254a6060705174cebbfac273a99532e7a49ff..9b9ed14886c8e571e62a24a5fe0ae533a578d905 100644 (file)
--- a/src/java/org/mxchange/localization/generic_en_US.properties
+++ b/src/java/org/mxchange/localization/generic_en_US.properties
@@ -1134,3 +1134,4 @@ ADMIN_CONTACT_DETAILS_HEADER=Contact data of {0} {1} {2}:
 ADMIN_DEPARTMENT_DETAILS_HEADER=Data of department {0} (Id {1}):
 ADMIN_HEADQUARTER_DETAILS_HEADER=Headquarter of {0} (Id {1})):
 CHANGE=Change?
+ERROR_PARAMETER_CONFIRM_KEY_IS_NOT_SET=Error: Parameter "confirmKey" is required.

diff --git a/web/WEB-INF/links.jsf.taglib.xml b/web/WEB-INF/links.jsf.taglib.xml
index 681291de4d04fbed7bb19ec8e8c394e1c31b633a..ed7cf108a1f237159f14bc09341a9d242bfe9735 100644 (file)
--- a/web/WEB-INF/links.jsf.taglib.xml
+++ b/web/WEB-INF/links.jsf.taglib.xml
@@ -39,29 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <type>java.lang.Boolean</type>
                </attribute>
        </tag>
-       <tag>
-               <tag-name>outputContactAdminDropdownMenu</tag-name>
-               <description>This tag renders an administrative drop-down menu for given contact instance.</description>
-               <source>resources/tags/admin/dropdown/contact/admin_contact_links.tpl</source>
-               <attribute>
-                       <name>contact</name>
-                       <description>The contact instance that provides the data for this tag.</description>
-                       <required>true</required>
-                       <type>org.mxchange.jcontacts.model.contact.Contact</type>
-               </attribute>
-               <attribute>
-                       <name>renderShowLink</name>
-                       <description>Whether to render (default: true) "show contact" link.</description>
-                       <required>false</required>
-                       <type>java.langBoolean</type>
-               </attribute>
-               <attribute>
-                       <name>rendered</name>
-                       <description>Whether this tag is being rendered by JSF engine (default: true).</description>
-                       <required>false</required>
-                       <type>java.lang.Boolean</type>
-               </attribute>
-       </tag>
        <tag>
                <tag-name>outputUserAdminDropdownMenu</tag-name>
                <description>This tag renders an administrative drop-down menu for given user instance.</description>

diff --git a/web/WEB-INF/resources/tags/admin/dropdown/contact/admin_contact_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/contact/admin_contact_links.tpl
deleted file mode 100644 (file)
index 3000885..0000000
--- a/web/WEB-INF/resources/tags/admin/dropdown/contact/admin_contact_links.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-       xmlns:p="http://primefaces.org/ui"
-       >
-
-       <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
-               <p:menuitem outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
-                       <f:param name="contactId" value="#{contact.contactId}" />
-               </p:menuitem>
-
-               <p:menuitem outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
-                       <f:param name="contactId" value="#{contact.contactId}" />
-               </p:menuitem>
-
-               <p:menuitem outcome="admin_delete_contact">
-                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}" />
-                       <f:param name="contactId" value="#{contact.contactId}" />
-               </p:menuitem>
-       </p:menuButton>
-</ui:composition>

diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
index f7de319d9af565cb4c3fc380e272d8f9304a1d36..d9d74ea0ac7441f32afdfc6a511fef544fd4b261 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/fax/admin_fax_data.tpl
@@ -57,23 +57,44 @@
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
                                <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
-                                       <p:menuitem outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
-                                               <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+                                       <p:menuitem
+                                               outcome="admin_show_fax"
+                                               value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+                                               title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}"
+                                               >
+                                               <f:param name="faxId" value="#{faxNumber.phoneId}" />
                                        </p:menuitem>
 
-                                       <p:menuitem outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_FAX_NUMBER_TITLE}">
-                                               <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+                                       <p:menuitem
+                                               outcome="admin_edit_fax"
+                                               value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+                                               title="#{msg.ADMIN_LINK_EDIT_FAX_NUMBER_TITLE}"
+                                               >
+                                               <f:param name="faxId" value="#{faxNumber.phoneId}" />
                                        </p:menuitem>
 
-                                       <p:menuitem outcome="admin_unlink_contact_fax" rendered="#{not empty contact}">
-                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
-                                               <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+                                       <p:menuitem
+                                               outcome="admin_unlink_contact_fax"
+                                               rendered="#{not empty contact}"
+                                               >
+                                               <h:outputText
+                                                       styleClass="link-warning"
+                                                       value="#{msg.ADMIN_LINK_UNLINK_SHORT}"
+                                                       title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}"
+                                                       />
+                                               <f:param name="faxId" value="#{faxNumber.phoneId}" />
                                                <f:param name="contactId" value="#{contact.contactId}" />
                                        </p:menuitem>
 
-                                       <p:menuitem outcome="admin_delete_fax">
-                                               <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_FAX_NUMBER_TITLE}" />
-                                               <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+                                       <p:menuitem
+                                               outcome="admin_delete_fax"
+                                               >
+                                               <h:outputText
+                                                       styleClass="link-danger"
+                                                       value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+                                                       title="#{msg.ADMIN_LINK_DELETE_FAX_NUMBER_TITLE}"
+                                                       />
+                                               <f:param name="faxId" value="#{faxNumber.phoneId}" />
                                        </p:menuitem>
                                </p:menuButton>
                        </h:panelGroup>

diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
index a4cb85ddae49ee35a5e6447e859f7f0c6b98a3e6..9ad30767835870b26b4308386f76207702a8156e 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/landline/admin_landline_data.tpl
@@ -56,24 +56,48 @@
                        <p:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
                        <h:panelGroup styleClass="table-data-field" layout="block">
-                               <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
-                                       <p:menuitem outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
-                                               <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+                               <p:menuButton
+                                       value="#{msg.OPTIONS}"
+                                       rendered="#{empty rendered or rendered}"
+                                       >
+                                       <p:menuitem
+                                               outcome="admin_show_landline"
+                                               value="#{msg.ADMIN_LINK_SHOW_SHORT}"
+                                               title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}"
+                                               >
+                                               <f:param name="landLineId" value="#{landLineNumber.phoneId}" />
                                        </p:menuitem>
 
-                                       <p:menuitem outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_LAND_LINE_NUMBER_TITLE}">
-                                               <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+                                       <p:menuitem
+                                               outcome="admin_edit_landline"
+                                               value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+                                               title="#{msg.ADMIN_LINK_EDIT_LAND_LINE_NUMBER_TITLE}"
+                                               >
+                                               <f:param name="landLineId" value="#{landLineNumber.phoneId}" />
                                        </p:menuitem>
 
-                                       <p:menuitem outcome="admin_unlink_contact_landline" rendered="#{not empty contact}">
-                                               <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE}" />
-                                               <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+                                       <p:menuitem
+                                               outcome="admin_unlink_contact_landline"
+                                               rendered="#{not empty contact}"
+                                               >
+                                               <h:outputText
+                                                       styleClass="link-warning"
+                                                       value="#{msg.ADMIN_LINK_UNLINK_SHORT}"
+                                                       title="#{msg.ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE}"
+                                                       />
+                                               <f:param name="landLineId" value="#{landLineNumber.phoneId}" />
                                                <f:param name="contactId" value="#{contact.contactId}" />
                                        </p:menuitem>
 
-                                       <p:menuitem outcome="admin_delete_landline">
-                                               <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_LAND_LINE_NUMBER_TITLE}" />
-                                               <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+                                       <p:menuitem
+                                               outcome="admin_delete_landline"
+                                               >
+                                               <h:outputText
+                                                       styleClass="link-danger"
+                                                       value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+                                                       title="#{msg.ADMIN_LINK_DELETE_LAND_LINE_NUMBER_TITLE}"
+                                                       />
+                                               <f:param name="landLineId" value="#{landLineNumber.phoneId}" />
                                        </p:menuitem>
                                </p:menuButton>
                        </h:panelGroup>

diff --git a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
index 5c4c16cf612a1ad3767f5082a9f6c2d4528edf87..3ce553e2fa37887920dc3dd1e6549739b27bdac4 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/panel_grids/mobile/admin_mobile_data.tpl
@@ -66,22 +66,22 @@
                        <h:panelGroup styleClass="table-data-field" layout="block">
                                <p:menuButton value="#{msg.OPTIONS}" rendered="#{empty rendered or rendered}">
                                        <p:menuitem outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_MOBILE_NUMBER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
-                                               <f:param name="phoneId" value="#{mobileNumber.mobileId}" />
+                                               <f:param name="mobileId" value="#{mobileNumber.mobileId}" />
                                        </p:menuitem>
 
                                        <p:menuitem outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_MOBILE_NUMBER_TITLE}">
-                                               <f:param name="phoneId" value="#{mobileNumber.mobileId}" />
+                                               <f:param name="mobileId" value="#{mobileNumber.mobileId}" />
                                        </p:menuitem>
 
                                        <p:menuitem outcome="admin_unlink_contact_mobile" rendered="#{not empty contact}">
                                                <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
-                                               <f:param name="phoneId" value="#{mobileNumber.mobileId}" />
+                                               <f:param name="mobileId" value="#{mobileNumber.mobileId}" />
                                                <f:param name="contactId" value="#{contact.contactId}" />
                                        </p:menuitem>
 
                                        <p:menuitem outcome="admin_delete_mobile">
                                                <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_MOBILE_NUMBER_TITLE}" />
-                                               <f:param name="phoneId" value="#{mobileNumber.mobileId}" />
+                                               <f:param name="mobileId" value="#{mobileNumber.mobileId}" />
                                        </p:menuitem>
                                </p:menuButton>
                        </h:panelGroup>

diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml
index fb75adfdb57c19e3f90ffacc8368fe357b9c71d1..e15b995725c2b64d52faf187c7fd8158fdb4419d 100644 (file)
--- a/web/admin/basic_data/admin_basic_data_list.xhtml
+++ b/web/admin/basic_data/admin_basic_data_list.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:links="http://mxchange.org/jsf/core/links"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"

diff --git a/web/admin/branch_office/admin_branch_office_list.xhtml b/web/admin/branch_office/admin_branch_office_list.xhtml
index fa234ae3ea8db0b67353b1aa52fb6656887d0b96..919baa810f7d8434b95edda5d008e5430514d5eb 100644 (file)
--- a/web/admin/branch_office/admin_branch_office_list.xhtml
+++ b/web/admin/branch_office/admin_branch_office_list.xhtml
@@ -3,7 +3,6 @@
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:core="http://mxchange.org/jsf/core/widgets"
-       xmlns:links="http://mxchange.org/jsf/core/links"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -402,7 +401,7 @@
                                                                        title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}"
                                                                        rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchLandLineNumber}"
                                                                        >
-                                                                       <f:param name="phoneId" value="#{branchOfficeListController.selectedBranchOffice.branchLandLineNumber.phoneId}" />
+                                                                       <f:param name="landLineId" value="#{branchOfficeListController.selectedBranchOffice.branchLandLineNumber.phoneId}" />
                                                                </p:link>
                                                                <h:outputText value="#{msg.NO_LANDLINE_NUMBER_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchLandLineNumber}" />
 
@@ -414,7 +413,7 @@
                                                                        title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}"
                                                                        rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchFaxNumber}"
                                                                        >
-                                                                       <f:param name="phoneId" value="#{branchOfficeListController.selectedBranchOffice.branchFaxNumber.phoneId}" />
+                                                                       <f:param name="faxId" value="#{branchOfficeListController.selectedBranchOffice.branchFaxNumber.phoneId}" />
                                                                </p:link>
                                                                <h:outputText value="#{msg.NO_FAX_NUMBER_ASSIGNED_TO_BRANCH_OFFICE}" rendered="#{empty branchOfficeListController.selectedBranchOffice.branchFaxNumber}" />
                                                        </p:panelGrid>

diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index 28c76fc04af2d8e57eecafbe32a0a2c646912649..ed461dee2292c046816b0b6ec3c4f2974113b70d 100644 (file)
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -11,8 +11,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
-                       <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{adminContactController.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
                </f:metadata>
        </ui:define>
 
@@ -25,8 +31,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerDeleteContact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
                <h:form rendered="#{not empty beanHelper.contact}">
                        <h:inputHidden value="#{adminContactController.contactId}" />
 

diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 60c868d9ace707c17048ebc2906f67217d997797..d2b697b8cf115977e2fe96aefa57573546c03294 100644 (file)
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -11,7 +11,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{beanHelper.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,8 +32,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerEditContact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
                <h:form rendered="#{not empty beanHelper.contact}">
                        <h:inputHidden value="#{adminContactController.contactId}" />
 

diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index d07b6c24ff20f13da29f7ce000a0bf311c5eba21..2510aaec56eaa893a33ef7df59606552a770b709 100644 (file)
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -177,7 +177,20 @@
                                        sortable="false"
                                        filterable="false"
                                        >
-                                       <links:outputContactAdminDropdownMenu contact="#{contact}" />
+                                       <p:menuButton value="#{msg.OPTIONS}">
+                                               <p:menuitem outcome="admin_show_contact" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" rendered="#{empty renderShowLink or renderShowLink}">
+                                                       <f:param name="contactId" value="#{contact.contactId}" />
+                                               </p:menuitem>
+
+                                               <p:menuitem outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+                                                       <f:param name="contactId" value="#{contact.contactId}" />
+                                               </p:menuitem>
+
+                                               <p:menuitem outcome="admin_delete_contact">
+                                                       <h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}" />
+                                                       <f:param name="contactId" value="#{contact.contactId}" />
+                                               </p:menuitem>
+                                       </p:menuButton>
                                </p:column>
                        </p:dataTable>
 

diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index e253a92443581f95d2807ab50496af113a5f9c59..c7e2215b41a70b4a4fb7217dc3afee4a7c6601e1 100644 (file)
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -3,15 +3,22 @@
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:core="http://mxchange.org/jsf/core/widgets"
-       xmlns:links="http://mxchange.org/jsf/core/links"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
+       xmlns:p="http://primefaces.org/ui"
        >
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{beanHelper.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,7 +32,12 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerShowContact" message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
+               <core:outputMessageBox
+                       panelGroupId="errorHandlerShowContact"
+                       message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}"
+                       messageStyleClass="alert-danger"
+                       rendered="#{empty beanHelper.contact}"
+                       />
 
                <ui:fragment rendered="#{not empty beanHelper.contact}">
                        <h:panelGroup styleClass="para" layout="block">
@@ -33,7 +45,24 @@
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para" layout="block">
-                               <links:outputContactAdminDropdownMenu contact="#{beanHelper.contact}" renderShowLink="false" />
+                               <p:menuButton value="#{msg.OPTIONS}">
+                                       <p:menuitem
+                                               outcome="admin_edit_contact"
+                                               value="#{msg.ADMIN_LINK_EDIT_SHORT}"
+                                               title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}"
+                                               >
+                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+                                       </p:menuitem>
+
+                                       <p:menuitem outcome="admin_delete_contact">
+                                               <h:outputText
+                                                       styleClass="link-danger"
+                                                       value="#{msg.ADMIN_LINK_DELETE_SHORT}"
+                                                       title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}"
+                                                       />
+                                               <f:param name="contactId" value="#{beanHelper.contact.contactId}" />
+                                       </p:menuitem>
+                               </p:menuButton>
                        </h:panelGroup>
 
                        <h:panelGroup styleClass="para" layout="block">

diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 6f6b2402a1de14c3cd5851ecf4c2ccb570f78e7f..16433b4f3c10d6e130c13fe473a5445fe51a9028 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -11,8 +11,22 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+                       <f:viewParam
+                               name="faxId"
+                               value="#{beanHelper.faxNumber}"
+                               converter="FaxNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{beanHelper.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerContactConverted()}" />
                        <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
@@ -27,10 +41,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerUnlinkFaxNumber" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
-
-               <core:outputMessageBox panelGroupId="errorHandlerUnlinkContact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
                <h:form rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
                        <h:inputHidden value="#{adminContactPhoneController.contact}" />
                        <h:inputHidden value="#{adminContactPhoneController.phoneId}" />

diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 55026b33ce2fef2b49bf0b99f2a57fc1e7bcc7fc..44ccd6f496feb626961ef5efbbda464590025135 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -11,8 +11,22 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+                       <f:viewParam
+                               name="landLineId"
+                               value="#{beanHelper.landLineNumber}"
+                               converter="LandLineNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{beanHelper.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
                </f:metadata>
        </ui:define>
 
@@ -25,10 +39,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerUnlinkLandline" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
-               <core:outputMessageBox panelGroupId="errorHandlerUnlinkContact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
                <h:form rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber == beanHelper.landLineNumber}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">

diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 49b41a66128b467b8671537c5a3c5dd83a5d8d41..1d7d3d086ffca2cf5b7c2a3ee3a31b18bfed9bd8 100644 (file)
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -11,8 +11,22 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+                       <f:viewParam
+                               name="mobileId"
+                               value="#{beanHelper.mobileNumber}"
+                               converter="MobileNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{beanHelper.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
                </f:metadata>
        </ui:define>
 
@@ -25,10 +39,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerUnlinkMobile" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
-
-               <core:outputMessageBox panelGroupId="errorHandlerUnlinkContact" message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
-
                <h:form rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">

diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index b77176e45aaed50c056a247813362ee4db7fceff..9cb7b3b93abc8bfc04e446a7bf9ad238608225e5 100644 (file)
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:links="http://mxchange.org/jsf/core/links"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"

diff --git a/web/admin/department/admin_department_list.xhtml b/web/admin/department/admin_department_list.xhtml
index 6d02e8c241655fa40d4140f530c4a9cdbd070544..5737d7199fa60b34a3da2978f1339df26dd92238 100644 (file)
--- a/web/admin/department/admin_department_list.xhtml
+++ b/web/admin/department/admin_department_list.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:links="http://mxchange.org/jsf/core/links"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"

diff --git a/web/admin/employee/admin_employee_list.xhtml b/web/admin/employee/admin_employee_list.xhtml
index 0363e00a63c1e98d2bbe03637e4276461addc0d0..399f38fd26130e850b15d0df42ffe575a358dda7 100644 (file)
--- a/web/admin/employee/admin_employee_list.xhtml
+++ b/web/admin/employee/admin_employee_list.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:links="http://mxchange.org/jsf/core/links"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"

diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index 1de0d0be1711d4e64abd21c41daf83bc1c108148..df5534fc8e97f4d1a24e7702a907cc86c9079663 100644 (file)
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -11,7 +11,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam
+                               name="faxId"
+                               value="#{beanHelper.faxNumber}"
+                               converter="FaxNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,8 +32,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerDeleteFax" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
-
                <h:form rendered="#{not empty beanHelper.faxNumber}">
                        <h:inputHidden value="#{adminPhoneController.phoneId}" />
 

diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index 1ce0f9df423123e8c312ceb3a0537959ee549432..6dec4e53b351ded3273260a0dba043f534b03331 100644 (file)
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -11,7 +11,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam
+                               name="faxId"
+                               value="#{beanHelper.faxNumber}"
+                               converter="FaxNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,8 +32,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerEditFax" message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
-
                <h:form rendered="#{not empty beanHelper.faxNumber}">
                        <h:inputHidden value="#{adminPhoneController.phoneId}" />
 

diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index 2146923a83eb989d281eba4622941b7871e23495..4ab4c338776eb11ecbe65b88fb22c3bcb07da471 100644 (file)
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -19,7 +18,7 @@
 
        <ui:define name="content">
                <p:dataTable
-                       id="table_list_fax"
+                       id="faxList"
                        var="faxNumber"
                        value="#{phoneListController.allFaxNumbers}"
                        paginator="true"
@@ -37,7 +36,7 @@
                                        value="#{faxNumber.phoneId}"
                                        title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}"
                                        >
-                                       <f:param name="phoneId" value="#{faxNumber.phoneId}" />
+                                       <f:param name="faxId" value="#{faxNumber.phoneId}" />
                                </p:link>
                        </p:column>
 

diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 18c9ada8dfb2c2a4ddfa82a22841a01f8b32b852..782d201526250e638bb0e94ad4aac7ca52d32967 100644 (file)
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -11,7 +11,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.faxNumber}" converter="FaxNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+                       <f:viewParam
+                               name="faxId"
+                               value="#{beanHelper.faxNumber}"
+                               converter="FaxNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerFaxNumberConverted()}" />
                </f:metadata>
        </ui:define>
@@ -98,7 +105,7 @@
                                                                outcome="admin_unlink_contact_fax"
                                                                >
                                                                <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_FAX_NUMBER_CONTACT_TITLE}" />
-                                                               <f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
+                                                               <f:param name="faxId" value="#{beanHelper.faxNumber.phoneId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
                                                        </p:link>
                                                </li>

diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index a9bf9dcfdfdf00bec1b44a056ba10ddb1975c2a2..37d4d2b168c60fbb4cb019dc821ffbf8bae8ab3b 100644 (file)
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -11,7 +11,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam
+                               name="landLineId"
+                               value="#{beanHelper.landLineNumber}"
+                               converter="LandLineNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,8 +32,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerDeleteLandline" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
                <h:form rendered="#{not empty beanHelper.landLineNumber}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table-header">

diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index 4f9d0fc5a7fa9622bdd3095ad124f06f839badf7..d2b7dd85df084914e565627bcaad1e016fb6143f 100644 (file)
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -11,7 +11,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam
+                               name="landLineId"
+                               value="#{beanHelper.landLineNumber}"
+                               converter="LandLineNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,8 +32,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerEditLandline" message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
-
                <h:form rendered="#{not empty beanHelper.landLineNumber}">
                        <h:panelGroup layout="block">
                                <div class="table-header">

diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index 64b628187ee0c78e9754e5570e5f40448e21a656..b68260dee7fb36ae00cb0a2fa331b52324ba5817 100644 (file)
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -36,7 +36,7 @@
                                        value="#{landLineNumber.phoneId}"
                                        title="#{msg.ADMIN_LINK_SHOW_LAND_LINE_NUMBER_TITLE}"
                                        >
-                                       <f:param name="phoneId" value="#{landLineNumber.phoneId}" />
+                                       <f:param name="landLineId" value="#{landLineNumber.phoneId}" />
                                </p:link>
                        </p:column>
 

diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index fdf288d54c64ca7eec8c977f3386b7e0ae13fa1a..e0b83ae1e96faa1bbf54a8326cd1d9d5ef41b1ca 100644 (file)
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -11,7 +11,13 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.landLineNumber}" converter="LandLineNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+                       <f:viewParam
+                               name="landLineId"
+                               value="#{beanHelper.landLineNumber}"
+                               converter="LandLineNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerLandLineNumberConverted()}" />
                </f:metadata>
        </ui:define>
@@ -97,7 +103,7 @@
                                                                outcome="admin_unlink_contact_landline"
                                                                >
                                                                <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_LAND_LINE_NUMBER_CONTACT_TITLE}" />
-                                                               <f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
+                                                               <f:param name="landLineId" value="#{beanHelper.landLineNumber.phoneId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
                                                        </p:link>
                                                </li>

diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
index 753a0583875ea3e97a6d3848ec147eed434261ef..43f4982bd90ef880575d21f94723a9ad08dcb18f 100644 (file)
--- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml
@@ -9,8 +9,22 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{adminPhoneController.mobileNumber}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
-                       <f:viewParam name="contactId" value="#{beanHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}" />
+                       <f:viewParam
+                               name="mobileId"
+                               value="#{adminMobileController.mobileNumber}"
+                               converter="CellphoneConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
+                       <f:viewParam
+                               name="contactId"
+                               value="#{beanHelper.contact}"
+                               converter="ContactConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_CONTACT_ID_INVALID}"
+                               />
                </f:metadata>
        </ui:define>
 

diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 557e17c56c1df3a1c5e496607b0068e92778ba75..f5600af592b7267d32aa2e21f57a1d71ada4cc99 100644 (file)
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -11,7 +11,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam
+                               name="mobileId"
+                               value="#{beanHelper.mobileNumber}"
+                               converter="MobileNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
                </f:metadata>
        </ui:define>
@@ -44,7 +51,7 @@
                                <p:commandButton
                                        type="submit"
                                        value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}"
-                                       action="#{adminPhoneController.deleteMobileData()}"
+                                       action="#{adminMobileController.deleteMobileData()}"
                                        />
                        </h:panelGroup>
                </h:form>

diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index 5ac28359c65c0c2badcf7eec02120ff0ce174272..2cd6db147d07ac46c2980337a3201c6a435c30b0 100644 (file)
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -11,7 +11,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam
+                               name="mobileId"
+                               value="#{beanHelper.mobileNumber}"
+                               converter="MobileNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,8 +32,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerEditMobile" message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
-
                <h:form rendered="#{not empty beanHelper.mobileNumber}">
                        <h:panelGroup layout="block">
                                <div class="table-header">
@@ -46,7 +51,7 @@
                                        <p:commandButton
                                                type="submit"
                                                value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}"
-                                               action="#{adminPhoneController.doUpdateMobileNumber()}"
+                                               action="#{adminMobileController.doUpdateMobileNumber()}"
                                                />
                                </p:panelGrid>
                        </h:panelGroup>

diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 8549b428e03e13fc19d271319b6aa6d5f19108c0..8f7eeef2f2325a863bb19b3ca598d884e8419c8b 100644 (file)
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -11,7 +11,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="phoneId" value="#{beanHelper.mobileNumber}" converter="MobileNumberConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}" />
+                       <f:viewParam
+                               name="mobileId"
+                               value="#{beanHelper.mobileNumber}"
+                               converter="MobileNumberConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_PHONE_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerMobileNumberConverted()}" />
                </f:metadata>
        </ui:define>
@@ -98,7 +105,7 @@
                                                                outcome="admin_unlink_contact_mobile"
                                                                >
                                                                <h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_MOBILE_NUMBER_CONTACT_TITLE}" />
-                                                               <f:param name="phoneId" value="#{beanHelper.mobileNumber.mobileId}" />
+                                                               <f:param name="mobileId" value="#{beanHelper.mobileNumber.mobileId}" />
                                                                <f:param name="contactId" value="#{contact.contactId}" />
                                                        </p:link>
                                                </li>

diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index b966ec5b831a99dc944c3eecbd4c62afc6486306..9a7cf4cfc4e8b088c918cee9fe3763579c067c7f 100644 (file)
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -11,7 +10,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,8 +31,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerUserActivityLog" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
                <p:dataTable
                        id="table_user_activity_log"
                        var="userActivity"

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 6df66c9445cdbfd5a6460f6842722f5c30acf90b..83a97f28b7643b4380a44d7b3e8165b6c605f333 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -11,7 +10,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,8 +31,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerDeleteUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
                <h:form rendered="#{not empty beanHelper.user}">
                        <h:panelGroup layout="block">
                                <div class="table-header">

diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 5485fc602f6999a903063fc3d79f977146735a84..eeb97a36939ba74ed6ccb244238709b09f5a88e2 100644 (file)
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -11,7 +11,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,8 +32,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerEditUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
                <h:form rendered="#{not empty beanHelper.user}">
                        <h:panelGroup layout="block">
                                <div class="table-header">

diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index 6987da79818186b621eeef6279b279dd50b80dcf..e34de43355de64863847fafd1f2e0ab6ef856711 100644 (file)
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -11,7 +10,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,8 +31,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerLockUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
                <h:form rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
                        <h:panelGroup layout="block">
                                <div class="table-header">

diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
index 45eb95b162470d68f095b8793917cba831ec52e8..1697534ee2b5a1fe610a9da76a7bf508e7b6195d 100644 (file)
--- a/web/admin/user/admin_user_resend_confirmation_link.xhtml
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -11,7 +10,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,8 +31,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerResendLinkUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
                <h:form rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
                        <h:panelGroup layout="block">
                                <div class="table-header">

diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index a15156b379c289e6b67d3edae90d6760a2948098..3f7f6c37d4904b841e0eafb88299146384aada17 100644 (file)
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:links="http://mxchange.org/jsf/core/links"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -11,7 +10,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,8 +31,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerShowUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
                <ui:fragment rendered="#{not empty beanHelper.user}">
                        <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
 

diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 0958cd5f92c3658fe17a80509285c2dc394a536a..af1ac85f4587abcf193cf1630d2aa9d87af7260f 100644 (file)
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -2,7 +2,6 @@
 <ui:composition
        template="/WEB-INF/templates/admin/admin_base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:core="http://mxchange.org/jsf/core/widgets"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:f="http://xmlns.jcp.org/jsf/core"
@@ -11,7 +10,14 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="userId" value="#{beanHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" />
+                       <f:viewParam
+                               name="userId"
+                               value="#{beanHelper.user}"
+                               converter="UserConverter"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}"
+                               converterMessage="#{msg.PARAMETER_USER_ID_INVALID}"
+                               />
                        <f:viewAction action="#{beanHelper.notifyControllerUserConverted()}" />
                </f:metadata>
        </ui:define>
@@ -25,8 +31,6 @@
        </ui:define>
 
        <ui:define name="content">
-               <core:outputMessageBox panelGroupId="errorHandlerUnlockUser" message="#{msg.ERROR_USER_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
-
                <h:form rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
                        <h:panelGroup layout="block">
                                <div class="table-header">

diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index 8d610288dde38f98f181d725fc2e57544e1688b8..5f37c3f3ea1d973941ac7165d44f4be962bd02ad 100644 (file)
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -10,7 +10,12 @@
 
        <ui:define name="metadata">
                <f:metadata>
-                       <f:viewParam name="confirmKey" value="#{userConfirmationLinkController.confirmationKey}" />
+                       <f:viewParam
+                               name="confirmKey"
+                               value="#{userConfirmationLinkController.confirmationKey}"
+                               required="true"
+                               requiredMessage="#{msg.ERROR_PARAMETER_CONFIRM_KEY_IS_NOT_SET}"
+                               />
                        <f:viewAction action="#{userConfirmationLinkController.maybeConfirmUserAccount()}" />
                </f:metadata>
        </ui:define>
@@ -41,7 +46,5 @@
 
                        <core:outputMessageBox panelGroupId="errorHandlerConfirmUser" message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
                </ui:fragment>
-
-               <core:outputMessageBox panelGroupId="errorConfirmationKey" message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
        </ui:define>
 </ui:composition>