From 6ecb76057797945d48da999e0586c30a58f15cbe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 19 Apr 2020 02:07:53 +0200 Subject: [PATCH] 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../JobsAdminContactWebRequestBean.java | 189 ++++++++++++------ .../contact/JobsContactWebRequestBean.java | 6 +- .../list/JobsContactListWebViewBean.java | 29 ++- .../FinancialsUserActionWebRequestBean.java | 6 +- .../JobsAdminCountryWebRequestBean.java | 6 +- ...JobsAdminMobileProviderWebRequestBean.java | 4 +- .../JobsUserProfileWebRequestBean.java | 4 +- .../user/JobsAdminUserWebRequestBean.java | 16 +- .../JobsConfirmationLinkWebRequestBean.java | 8 +- .../JobsEmailChangeWebRequestBean.java | 4 +- .../JobsUserPasswordWebRequestBean.java | 8 +- .../JobsUserRegisterWebRequestBean.java | 18 +- .../localization/generic_de_DE.properties | 1 + .../localization/generic_en_US.properties | 1 + web/WEB-INF/links.jsf.taglib.xml | 23 --- .../dropdown/contact/admin_contact_links.tpl | 24 --- .../admin/panel_grids/fax/admin_fax_data.tpl | 41 +++- .../landline/admin_landline_data.tpl | 46 ++++- .../panel_grids/mobile/admin_mobile_data.tpl | 8 +- .../basic_data/admin_basic_data_list.xhtml | 1 - .../admin_branch_office_list.xhtml | 5 +- web/admin/contact/admin_contact_delete.xhtml | 12 +- web/admin/contact/admin_contact_edit.xhtml | 11 +- web/admin/contact/admin_contact_list.xhtml | 15 +- web/admin/contact/admin_contact_show.xhtml | 37 +++- .../unlink/admin_contact_fax_unlink.xhtml | 22 +- .../admin_contact_landline_unlink.xhtml | 22 +- .../unlink/admin_contact_mobile_unlink.xhtml | 22 +- web/admin/country/admin_country_list.xhtml | 1 - .../department/admin_department_list.xhtml | 1 - web/admin/employee/admin_employee_list.xhtml | 1 - web/admin/fax/admin_fax_delete.xhtml | 11 +- web/admin/fax/admin_fax_edit.xhtml | 11 +- web/admin/fax/admin_fax_list.xhtml | 5 +- web/admin/fax/admin_fax_show.xhtml | 11 +- .../landline/admin_landline_delete.xhtml | 11 +- web/admin/landline/admin_landline_edit.xhtml | 11 +- web/admin/landline/admin_landline_list.xhtml | 2 +- web/admin/landline/admin_landline_show.xhtml | 10 +- .../mobile/admin_contact_mobile_unlink.xhtml | 18 +- web/admin/mobile/admin_mobile_delete.xhtml | 11 +- web/admin/mobile/admin_mobile_edit.xhtml | 13 +- web/admin/mobile/admin_mobile_show.xhtml | 11 +- web/admin/user/admin_user_activity_log.xhtml | 12 +- web/admin/user/admin_user_delete.xhtml | 12 +- web/admin/user/admin_user_edit.xhtml | 11 +- web/admin/user/admin_user_lock.xhtml | 12 +- .../admin_user_resend_confirmation_link.xhtml | 12 +- web/admin/user/admin_user_show.xhtml | 12 +- web/admin/user/admin_user_unlock.xhtml | 12 +- web/guest/user/user_confirm_account.xhtml | 9 +- 51 files changed, 540 insertions(+), 269 deletions(-) delete mode 100644 web/WEB-INF/resources/tags/admin/dropdown/contact/admin_contact_links.tpl diff --git a/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/JobsAdminContactWebRequestBean.java index 3d007ad5..728edaf4 100644 --- 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 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 + *

+ * @return Contact instance + */ + public Contact getContact () { + return this.contact; + } + + /** + * Setter for contact instance + *

+ * @param contact Contact instance + */ + public void setContact (final Contact contact) { + this.contact = contact; + } + /** * Getter for contactCountry instance *

@@ -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 7e8a6687..d9e62b76 100644 --- 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 0cd3e999..5c8b19a1 100644 --- 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 + *

+ * @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 *

@@ -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 b47710e0..effde46a 100644 --- 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 7b3bdc1c..98a5a7c3 100644 --- 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 bd3fccd7..cc7067a8 100644 --- 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 affc3e8d..a943ba2c 100644 --- 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 f24d0437..fb901415 100644 --- 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 e83ea21e..34da8b17 100644 --- 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 31f1998b..519a869a 100644 --- 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 22c28a8e..be9c1624 100644 --- 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 77d79963..fa9db991 100644 --- 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 fd3b1e60..a42bed7a 100644 --- 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 f1d254a6..9b9ed148 100644 --- 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 681291de..ed7cf108 100644 --- 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 . java.lang.Boolean - - outputContactAdminDropdownMenu - This tag renders an administrative drop-down menu for given contact instance. - resources/tags/admin/dropdown/contact/admin_contact_links.tpl - - contact - The contact instance that provides the data for this tag. - true - org.mxchange.jcontacts.model.contact.Contact - - - renderShowLink - Whether to render (default: true) "show contact" link. - false - java.langBoolean - - - rendered - Whether this tag is being rendered by JSF engine (default: true). - false - java.lang.Boolean - - outputUserAdminDropdownMenu This tag renders an administrative drop-down menu for given user instance. 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 index 3000885d..00000000 --- a/web/WEB-INF/resources/tags/admin/dropdown/contact/admin_contact_links.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - 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 f7de319d..d9d74ea0 100644 --- 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 @@ - - + + - - + + - - - + + + - - - + + + 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 a4cb85dd..9ad30767 100644 --- 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 @@ - - - + + + - - + + - - - + + + - - - + + + 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 5c4c16cf..3ce553e2 100644 --- 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 @@ - + - + - + - + diff --git a/web/admin/basic_data/admin_basic_data_list.xhtml b/web/admin/basic_data/admin_basic_data_list.xhtml index fb75adfd..e15b9957 100644 --- a/web/admin/basic_data/admin_basic_data_list.xhtml +++ b/web/admin/basic_data/admin_basic_data_list.xhtml @@ -2,7 +2,6 @@ - + @@ -414,7 +413,7 @@ title="#{msg.ADMIN_LINK_SHOW_FAX_NUMBER_TITLE}" rendered="#{not empty branchOfficeListController.selectedBranchOffice.branchFaxNumber}" > - + diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml index 28c76fc0..ed461dee 100644 --- a/web/admin/contact/admin_contact_delete.xhtml +++ b/web/admin/contact/admin_contact_delete.xhtml @@ -11,8 +11,14 @@ - - + @@ -25,8 +31,6 @@ - - diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index 60c868d9..d2b697b8 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -11,7 +11,14 @@ - + @@ -25,8 +32,6 @@ - - diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml index d07b6c24..2510aaec 100644 --- a/web/admin/contact/admin_contact_list.xhtml +++ b/web/admin/contact/admin_contact_list.xhtml @@ -177,7 +177,20 @@ sortable="false" filterable="false" > - + + + + + + + + + + + + + + diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml index e253a924..c7e2215b 100644 --- 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" > - + @@ -25,7 +32,12 @@ - + @@ -33,7 +45,24 @@ - + + + + + + + + + + diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml index 6f6b2402..16433b4f 100644 --- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml @@ -11,8 +11,22 @@ - - + + @@ -27,10 +41,6 @@ - - - - diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml index 55026b33..44ccd6f4 100644 --- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml @@ -11,8 +11,22 @@ - - + + @@ -25,10 +39,6 @@ - - - -

diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml index 49b41a66..1d7d3d08 100644 --- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml @@ -11,8 +11,22 @@ - - + + @@ -25,10 +39,6 @@ - - - -
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml index b77176e4..9cb7b3b9 100644 --- a/web/admin/country/admin_country_list.xhtml +++ b/web/admin/country/admin_country_list.xhtml @@ -2,7 +2,6 @@ - + @@ -25,8 +32,6 @@ - - diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml index 1ce0f9df..6dec4e53 100644 --- a/web/admin/fax/admin_fax_edit.xhtml +++ b/web/admin/fax/admin_fax_edit.xhtml @@ -11,7 +11,14 @@ - + @@ -25,8 +32,6 @@ - - diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml index 2146923a..4ab4c338 100644 --- a/web/admin/fax/admin_fax_list.xhtml +++ b/web/admin/fax/admin_fax_list.xhtml @@ -2,7 +2,6 @@ - + diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml index 18c9ada8..782d2015 100644 --- a/web/admin/fax/admin_fax_show.xhtml +++ b/web/admin/fax/admin_fax_show.xhtml @@ -11,7 +11,14 @@ - + @@ -98,7 +105,7 @@ outcome="admin_unlink_contact_fax" > - + diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml index a9bf9dcf..37d4d2b1 100644 --- a/web/admin/landline/admin_landline_delete.xhtml +++ b/web/admin/landline/admin_landline_delete.xhtml @@ -11,7 +11,14 @@ - + @@ -25,8 +32,6 @@ - -
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml index 4f9d0fc5..d2b7dd85 100644 --- a/web/admin/landline/admin_landline_edit.xhtml +++ b/web/admin/landline/admin_landline_edit.xhtml @@ -11,7 +11,14 @@ - + @@ -25,8 +32,6 @@ - -
diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml index 64b62818..b68260de 100644 --- 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}" > - + diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml index fdf288d5..e0b83ae1 100644 --- a/web/admin/landline/admin_landline_show.xhtml +++ b/web/admin/landline/admin_landline_show.xhtml @@ -11,7 +11,13 @@ - + @@ -97,7 +103,7 @@ outcome="admin_unlink_contact_landline" > - + diff --git a/web/admin/mobile/admin_contact_mobile_unlink.xhtml b/web/admin/mobile/admin_contact_mobile_unlink.xhtml index 753a0583..43f4982b 100644 --- a/web/admin/mobile/admin_contact_mobile_unlink.xhtml +++ b/web/admin/mobile/admin_contact_mobile_unlink.xhtml @@ -9,8 +9,22 @@ - - + + diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml index 557e17c5..f5600af5 100644 --- a/web/admin/mobile/admin_mobile_delete.xhtml +++ b/web/admin/mobile/admin_mobile_delete.xhtml @@ -11,7 +11,14 @@ - + @@ -44,7 +51,7 @@ diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml index 5ac28359..2cd6db14 100644 --- a/web/admin/mobile/admin_mobile_edit.xhtml +++ b/web/admin/mobile/admin_mobile_edit.xhtml @@ -11,7 +11,14 @@ - + @@ -25,8 +32,6 @@ - -
@@ -46,7 +51,7 @@ diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml index 8549b428..8f7eeef2 100644 --- a/web/admin/mobile/admin_mobile_show.xhtml +++ b/web/admin/mobile/admin_mobile_show.xhtml @@ -11,7 +11,14 @@ - + @@ -98,7 +105,7 @@ outcome="admin_unlink_contact_mobile" > - + diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml index b966ec5b..9a7cf4cf 100644 --- a/web/admin/user/admin_user_activity_log.xhtml +++ b/web/admin/user/admin_user_activity_log.xhtml @@ -2,7 +2,6 @@ - + @@ -25,8 +31,6 @@ - - - + @@ -25,8 +31,6 @@ - -
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml index 5485fc60..eeb97a36 100644 --- a/web/admin/user/admin_user_edit.xhtml +++ b/web/admin/user/admin_user_edit.xhtml @@ -11,7 +11,14 @@ - + @@ -25,8 +32,6 @@ - -
diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml index 6987da79..e34de433 100644 --- a/web/admin/user/admin_user_lock.xhtml +++ b/web/admin/user/admin_user_lock.xhtml @@ -2,7 +2,6 @@ - + @@ -25,8 +31,6 @@ - -
diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml index 45eb95b1..1697534e 100644 --- a/web/admin/user/admin_user_resend_confirmation_link.xhtml +++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml @@ -2,7 +2,6 @@ - + @@ -25,8 +31,6 @@ - -
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index a15156b3..3f7f6c37 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -2,7 +2,6 @@ - + @@ -25,8 +31,6 @@ - - diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml index 0958cd5f..af1ac85f 100644 --- a/web/admin/user/admin_user_unlock.xhtml +++ b/web/admin/user/admin_user_unlock.xhtml @@ -2,7 +2,6 @@ - + @@ -25,8 +31,6 @@ - -
diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml index 8d610288..5f37c3f3 100644 --- a/web/guest/user/user_confirm_account.xhtml +++ b/web/guest/user/user_confirm_account.xhtml @@ -10,7 +10,12 @@ - + @@ -41,7 +46,5 @@ - - -- 2.39.5