From e8666fc28e132150ffc00ccae8af801e0ad780aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 9 Aug 2016 17:36:29 +0200 Subject: [PATCH] Continued with some rewrites: (please cherry-pick) - moved cellPhoneNumber to beanHelper as this is the right place - introduced copyCellphoneNumberToController() and called it in edit template for having all editable data being set in backing bean MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- nbproject/faces-config.NavData | 134 +++++++++--------- .../phone/JobsContactPhoneWebSessionBean.java | 11 +- .../helper/JobsWebRequestController.java | 70 +++++++-- .../beans/helper/JobsWebRequestHelper.java | 92 ++++++++++-- .../phone/JobsAdminPhoneWebRequestBean.java | 78 +++------- .../JobsAdminPhoneWebRequestController.java | 45 ------ .../admin/cellphone/admin_cellphone_data.tpl | 12 +- .../admin/cellphone/admin_cellphone_links.tpl | 12 +- .../cellphone/admin_form_cellphone_data.tpl | 4 +- .../cellphone/admin_cellphone_delete.xhtml | 2 +- .../cellphone/admin_cellphone_edit.xhtml | 7 +- .../cellphone/admin_cellphone_show.xhtml | 6 +- .../admin_contact_cellphone_unlink.xhtml | 2 +- 13 files changed, 262 insertions(+), 213 deletions(-) diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index 3031ef63..b2e1f7d8 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,75 +2,75 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java index 280e3db7..342a3e21 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/JobsContactPhoneWebSessionBean.java @@ -36,6 +36,7 @@ import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent; import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent; import org.mxchange.jjobs.beans.BaseJobsController; import org.mxchange.jjobs.beans.contact.JobsContactWebSessionController; +import org.mxchange.jjobs.beans.helper.JobsWebRequestController; import org.mxchange.jjobs.beans.phone.JobsAdminPhoneWebRequestController; import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote; import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; @@ -60,6 +61,12 @@ public class JobsContactPhoneWebSessionBean extends BaseJobsController implement @Inject private JobsAdminPhoneWebRequestController adminPhoneController; + /** + * Admin helper instance + */ + @Inject + private JobsWebRequestController beanHelper; + /** * General contact controller */ @@ -163,7 +170,7 @@ public class JobsContactPhoneWebSessionBean extends BaseJobsController implement @Override public List allCellphoneContacts () { // Get id - Long phoneId = this.adminPhoneController.getCellPhoneNumber().getPhoneId(); + Long phoneId = this.beanHelper.getCellPhoneNumber().getPhoneId(); // Is cache there? if (this.contacts.containsKey(phoneId)) { @@ -176,7 +183,7 @@ public class JobsContactPhoneWebSessionBean extends BaseJobsController implement // "Walk" through all contacts for (final Contact contact : this.contactController.allContacts()) { // Is cellphone instance the same? - if (Objects.equals(contact.getContactCellphoneNumber(), this.adminPhoneController.getCellPhoneNumber())) { + if (Objects.equals(contact.getContactCellphoneNumber(), this.beanHelper.getCellPhoneNumber())) { // Found one list.add(contact); } diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestController.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestController.java index 5fbc8d45..39ab3655 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestController.java @@ -18,6 +18,9 @@ package org.mxchange.jjobs.beans.helper; import java.io.Serializable; import org.mxchange.jcontacts.contact.Contact; +import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; /** @@ -28,18 +31,14 @@ import org.mxchange.jusercore.model.user.User; public interface JobsWebRequestController extends Serializable { /** - * Getter for user instance - *

- * @return User instance + * Copies currently set cell phone instance's data to admin phone controller */ - User getUser (); + void copyCellphoneNumberToController (); /** - * Setter for user instance - *

- * @param user User instance + * Copies currently set contact instance's data to adminContactController */ - void setUser (final User user); + void copyContactToController (); /** * Copies currently set user instance's data to adminUserController @@ -71,8 +70,59 @@ public interface JobsWebRequestController extends Serializable { void setContact (final Contact contact); /** - * Copies currently set contact instance's data to adminContactController + * Getter for user instance + *

+ * @return User instance */ - void copyContactToController (); + User getUser (); + + /** + * Setter for user instance + *

+ * @param user User instance + */ + void setUser (final User user); + + /** + * Getter for dialable cellphone number instance + *

+ * @return Dialable cellphone number instance + */ + DialableCellphoneNumber getCellPhoneNumber (); + + /** + * Setter for dialable cellphone number instance + *

+ * @param cellPhone Dialable cellphone number instance + */ + void setCellPhoneNumber (final DialableCellphoneNumber cellPhone); + + /** + * Getter for dialable land-line number instance + *

+ * @return Dialable land-line number instance + */ + DialableLandLineNumber getLandLine (); + + /** + * Setter for dialable land-line number instance + *

+ * @param landLine Dialable land-line number instance + */ + void setLandLine (final DialableLandLineNumber landLine); + + /** + * Getter for dialable fax number instance + *

+ * @return Dialable fax number instance + */ + DialableFaxNumber getFax (); + + /** + * Setter for dialable fax number instance + *

+ * @param fax Dialable fax number instance + */ + void setFax (final DialableFaxNumber fax); } diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java index 4d440cd6..3b756741 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebRequestHelper.java @@ -22,12 +22,12 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController; +import org.mxchange.jjobs.beans.phone.JobsAdminPhoneWebRequestController; import org.mxchange.jjobs.beans.user.JobsUserWebSessionController; import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jjobs.beans.phone.JobsAdminPhoneWebRequestController; /** * A general helper for beans @@ -55,11 +55,26 @@ public class JobsWebRequestHelper implements JobsWebRequestController { @Inject private JobsAdminPhoneWebRequestController adminPhoneController; + /** + * Cell phone number + */ + private DialableCellphoneNumber cellPhoneNumber; + /** * Contact instance */ private Contact contact; + /** + * Fax number + */ + private DialableFaxNumber fax; + + /** + * Land-line number + */ + private DialableLandLineNumber landLine; + /** * User instance */ @@ -78,11 +93,42 @@ public class JobsWebRequestHelper implements JobsWebRequestController { } @Override - public void copyContactToController () { - // Log message - //* NOISY-DEBUG: */ System.out.println("AdminHelper::copyContactToController - CALLED!"); //NOI18N + public void copyCellphoneNumberToController () { + // Validate cellphone instance + if (this.getCellPhoneNumber() == null) { + // Throw NPE + throw new NullPointerException("this.cellPhoneNumber is null"); + } else if (this.getCellPhoneNumber().getPhoneId() == null) { + // Throw again + throw new NullPointerException("this.cellPhoneNumber.phoneId is null"); + } else if (this.getCellPhoneNumber().getPhoneId() < 1) { + // Invalid id number + throw new IllegalArgumentException(MessageFormat.format("this.cellPhoneNumber.phoneId={0} is not valid", this.getCellPhoneNumber().getPhoneId())); + } else if (this.getCellPhoneNumber().getCellphoneProvider() == null) { + // Throw NPE again + throw new NullPointerException("this.cellPhoneNumber.cellphoneProvider is null"); + } else if (this.getCellPhoneNumber().getCellphoneProvider().getProviderId() == null) { + // ... throw again + throw new NullPointerException("this.cellPhoneNumber.cellphoneProvider.providerId is null"); + } else if (this.getCellPhoneNumber().getCellphoneProvider().getProviderId() < 1) { + // Invalid id + throw new IllegalArgumentException(MessageFormat.format("this.cellPhoneNumber.cellphoneProvider.providerId={0} is invalid", this.getCellPhoneNumber().getCellphoneProvider().getProviderId())); + } else if (this.getCellPhoneNumber().getPhoneNumber() == null) { + // Throw NPE again ... + throw new NullPointerException("this.cellPhoneNumber.phoneNumber is null"); + } else if (this.getCellPhoneNumber().getPhoneNumber() < 1) { + // Invalid id number + throw new IllegalArgumentException(MessageFormat.format("this.cellPhoneNumber.phoneNumber={0} is not valid", this.getCellPhoneNumber().getPhoneNumber())); + } - // Validate user instance + // Copy all (changeable) data fields to admin controller + this.adminPhoneController.setCellphoneProvider(this.getCellPhoneNumber().getCellphoneProvider()); + this.adminPhoneController.setPhoneNumber(this.getCellPhoneNumber().getPhoneNumber()); + } + + @Override + public void copyContactToController () { + // Validate contact instance if (this.getContact() == null) { // Throw NPE throw new NullPointerException("this.contact is null"); //NOI18N @@ -137,6 +183,16 @@ public class JobsWebRequestHelper implements JobsWebRequestController { //* NOISY-DEBUG: */ System.out.println("AdminHelper::copyUserToController - EXIT!"); //NOI18N } + @Override + public DialableCellphoneNumber getCellPhoneNumber () { + return this.cellPhoneNumber; + } + + @Override + public void setCellPhoneNumber (final DialableCellphoneNumber cellPhoneNumber) { + this.cellPhoneNumber = cellPhoneNumber; + } + @Override public Contact getContact () { return this.contact; @@ -177,6 +233,26 @@ public class JobsWebRequestHelper implements JobsWebRequestController { return messageKey; } + @Override + public DialableFaxNumber getFax () { + return this.fax; + } + + @Override + public void setFax (final DialableFaxNumber fax) { + this.fax = fax; + } + + @Override + public DialableLandLineNumber getLandLine () { + return this.landLine; + } + + @Override + public void setLandLine (final DialableLandLineNumber landLine) { + this.landLine = landLine; + } + @Override public User getUser () { return this.user; @@ -208,19 +284,19 @@ public class JobsWebRequestHelper implements JobsWebRequestController { // Is cellphone set? if (contact.getContactCellphoneNumber() instanceof DialableCellphoneNumber) { // Yes, then set it in admin controller - this.adminPhoneController.setCellPhoneNumber(contact.getContactCellphoneNumber()); + this.setCellPhoneNumber(contact.getContactCellphoneNumber()); } // Is land-line set? if (contact.getContactLandLineNumber() instanceof DialableLandLineNumber) { // Yes, then set it in admin controller - this.adminPhoneController.setLandLine(contact.getContactLandLineNumber()); + this.setLandLine(contact.getContactLandLineNumber()); } // Is fax set? if (contact.getContactFaxNumber() instanceof DialableFaxNumber) { // Yes, then set it in admin controller - this.adminPhoneController.setFax(contact.getContactFaxNumber()); + this.setFax(contact.getContactFaxNumber()); } } diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java index ee62859a..861b3e12 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java @@ -29,11 +29,10 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote; import org.mxchange.jjobs.beans.BaseJobsController; +import org.mxchange.jjobs.beans.helper.JobsWebRequestController; import org.mxchange.jphone.events.updated.AdminCellphoneNumberUpdatedEvent; import org.mxchange.jphone.events.updated.AdminUpdatedCellphoneNumberEvent; import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; /** @@ -56,9 +55,10 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements private AdminContactsPhoneSessionBeanRemote adminPhoneBean; /** - * Cell phone number + * Admin helper instance */ - private DialableCellphoneNumber cellPhoneNumber; + @Inject + private JobsWebRequestController beanHelper; /** * Event being fired when an administrator has updated cell phone number @@ -72,16 +72,6 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements */ private MobileProvider cellphoneProvider; - /** - * Fax number - */ - private DialableFaxNumber fax; - - /** - * Land-line number - */ - private DialableLandLineNumber landLine; - /** * Phone number */ @@ -107,30 +97,30 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements @Override public String editCellphoneData () { // Is all data set - if (this.getCellPhoneNumber() == null) { + if (this.beanHelper.getCellPhoneNumber() == null) { // Not set, throw NPE throw new NullPointerException("this.cellphoneNumber is null"); //NOI18N - } else if (this.getCellPhoneNumber().getPhoneId() == null) { + } else if (this.beanHelper.getCellPhoneNumber().getPhoneId() == null) { // Throw NPE again throw new NullPointerException("this.cellphoneNumber.phoneId is null"); //NOI18N - } else if (this.getCellPhoneNumber().getPhoneId() < 1) { + } else if (this.beanHelper.getCellPhoneNumber().getPhoneId() < 1) { // Invalid number - throw new IllegalArgumentException(MessageFormat.format("this.cellphoneNumber.phoneId={0} is not valid", this.getCellPhoneNumber().getPhoneId())); //NOI18N - } else if (this.getCellPhoneNumber().getCellphoneProvider() == null) { + throw new IllegalArgumentException(MessageFormat.format("this.cellphoneNumber.phoneId={0} is not valid", this.beanHelper.getCellPhoneNumber().getPhoneId())); //NOI18N + } else if (this.beanHelper.getCellPhoneNumber().getCellphoneProvider() == null) { // Throw NPE throw new NullPointerException("this.cellphoneNumber.cellphoneProvider is null"); //NOI18N - } else if (this.getCellPhoneNumber().getCellphoneProvider().getProviderId() == null) { + } else if (this.beanHelper.getCellPhoneNumber().getCellphoneProvider().getProviderId() == null) { // ... throw again throw new NullPointerException("this.cellphoneNumber.cellphoneProvider.providerId is null"); //NOI18N - } else if (this.getCellPhoneNumber().getCellphoneProvider().getProviderId() < 1) { + } else if (this.beanHelper.getCellPhoneNumber().getCellphoneProvider().getProviderId() < 1) { // Id not valid - throw new IllegalArgumentException(MessageFormat.format("this.cellphoneNumber.cellphoneProvider.providerId={0} is not valid.", this.getCellPhoneNumber().getCellphoneProvider().getProviderId())); //NOI18N - } else if (this.getCellPhoneNumber().getPhoneNumber() == null) { + throw new IllegalArgumentException(MessageFormat.format("this.cellphoneNumber.cellphoneProvider.providerId={0} is not valid.", this.beanHelper.getCellPhoneNumber().getCellphoneProvider().getProviderId())); //NOI18N + } else if (this.beanHelper.getCellPhoneNumber().getPhoneNumber() == null) { // Throw NPE again throw new NullPointerException("this.cellphoneNumber.phoneNumber is null"); //NOI18N - } else if (this.getCellPhoneNumber().getPhoneNumber() < 1) { + } else if (this.beanHelper.getCellPhoneNumber().getPhoneNumber() < 1) { // Throw NPE again - throw new NullPointerException(MessageFormat.format("this.cellphoneNumber.phoneNumber={0} is not valid.", this.getCellPhoneNumber().getPhoneNumber())); //NOI18N + throw new NullPointerException(MessageFormat.format("this.cellphoneNumber.phoneNumber={0} is not valid.", this.beanHelper.getCellPhoneNumber().getPhoneNumber())); //NOI18N } else if (this.getCellphoneProvider() == null) { // Not provided this.showFacesMessage("form_edit_cellphone:cellphoneProvider", "No mobile provider selected"); //NOI18N @@ -148,17 +138,17 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements } // Is the mobile provider and number the same? - if ((Objects.equals(this.getCellphoneProvider(), this.getCellPhoneNumber().getCellphoneProvider())) && (Objects.equals(this.getPhoneNumber(), this.getCellPhoneNumber().getPhoneNumber()))) { + if ((Objects.equals(this.getCellphoneProvider(), this.beanHelper.getCellPhoneNumber().getCellphoneProvider())) && (Objects.equals(this.getPhoneNumber(), this.beanHelper.getCellPhoneNumber().getPhoneNumber()))) { // No difference in both together, no need to edit return ""; //NOI18N } // Set all data - this.getCellPhoneNumber().setCellphoneProvider(this.getCellphoneProvider()); - this.getCellPhoneNumber().setPhoneNumber(this.getPhoneNumber()); + this.beanHelper.getCellPhoneNumber().setCellphoneProvider(this.getCellphoneProvider()); + this.beanHelper.getCellPhoneNumber().setPhoneNumber(this.getPhoneNumber()); // Send to bean - DialableCellphoneNumber updatedNumber = this.adminPhoneBean.updateCellphoneData(this.getCellPhoneNumber()); + DialableCellphoneNumber updatedNumber = this.adminPhoneBean.updateCellphoneData(this.beanHelper.getCellPhoneNumber()); // Fire event this.cellPhoneNumberUpdatedEvent.fire(new AdminCellphoneNumberUpdatedEvent(updatedNumber)); @@ -167,16 +157,6 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements return "admin_edit_cellphone?faces-redirect=true&includeViewParams=true"; //NOI18N } - @Override - public DialableCellphoneNumber getCellPhoneNumber () { - return this.cellPhoneNumber; - } - - @Override - public void setCellPhoneNumber (final DialableCellphoneNumber cellPhoneNumber) { - this.cellPhoneNumber = cellPhoneNumber; - } - @Override public MobileProvider getCellphoneProvider () { return this.cellphoneProvider; @@ -187,26 +167,6 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements this.cellphoneProvider = cellphoneProvider; } - @Override - public DialableFaxNumber getFax () { - return this.fax; - } - - @Override - public void setFax (final DialableFaxNumber fax) { - this.fax = fax; - } - - @Override - public DialableLandLineNumber getLandLine () { - return this.landLine; - } - - @Override - public void setLandLine (final DialableLandLineNumber landLine) { - this.landLine = landLine; - } - @Override public Long getPhoneNumber () { return this.phoneNumber; diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java index b2e1d8ce..c74a4593 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestController.java @@ -18,9 +18,6 @@ package org.mxchange.jjobs.beans.phone; import java.io.Serializable; import javax.ejb.Local; -import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; -import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; -import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; /** @@ -39,48 +36,6 @@ public interface JobsAdminPhoneWebRequestController extends Serializable { */ String editCellphoneData (); - /** - * Getter for dialable cellphone number instance - *

- * @return Dialable cellphone number instance - */ - DialableCellphoneNumber getCellPhoneNumber (); - - /** - * Setter for dialable cellphone number instance - *

- * @param cellPhone Dialable cellphone number instance - */ - void setCellPhoneNumber (final DialableCellphoneNumber cellPhone); - - /** - * Setter for dialable land-line number instance - *

- * @param landLine Dialable land-line number instance - */ - void setLandLine (final DialableLandLineNumber landLine); - - /** - * Getter for dialable land-line number instance - *

- * @return Dialable land-line number instance - */ - DialableLandLineNumber getLandLine (); - - /** - * Setter for dialable fax number instance - *

- * @param fax Dialable fax number instance - */ - void setFax (final DialableFaxNumber fax); - - /** - * Getter for dialable fax number instance - *

- * @return Dialable fax number instance - */ - DialableFaxNumber getFax (); - /** * Getter for cell phone provider *

diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl index decbd614..dd960dd5 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl @@ -5,9 +5,9 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + - + @@ -15,22 +15,22 @@ - + - - + + - + diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl index c37d53f9..071b7fe6 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl @@ -5,15 +5,15 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + - +

  • - +
    • @@ -21,7 +21,7 @@
  • - +
    • @@ -29,7 +29,7 @@
  • - +
    • @@ -38,7 +38,7 @@
  • - +
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl index 88b55dbc..1acba675 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl +++ b/web/WEB-INF/templates/admin/cellphone/admin_form_cellphone_data.tpl @@ -5,7 +5,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
@@ -19,7 +19,7 @@
- +
diff --git a/web/admin/cellphone/admin_cellphone_delete.xhtml b/web/admin/cellphone/admin_cellphone_delete.xhtml index 829047db..13f28dc0 100644 --- a/web/admin/cellphone/admin_cellphone_delete.xhtml +++ b/web/admin/cellphone/admin_cellphone_delete.xhtml @@ -8,7 +8,7 @@ > - + diff --git a/web/admin/cellphone/admin_cellphone_edit.xhtml b/web/admin/cellphone/admin_cellphone_edit.xhtml index 159db8dc..2c87088a 100644 --- a/web/admin/cellphone/admin_cellphone_edit.xhtml +++ b/web/admin/cellphone/admin_cellphone_edit.xhtml @@ -8,7 +8,8 @@ > - + + @@ -19,7 +20,7 @@ - +
#{msg.ADMIN_EDIT_CELLPHONE_TITLE} @@ -34,7 +35,7 @@
- + diff --git a/web/admin/cellphone/admin_cellphone_show.xhtml b/web/admin/cellphone/admin_cellphone_show.xhtml index 0dac78b4..8a107ada 100644 --- a/web/admin/cellphone/admin_cellphone_show.xhtml +++ b/web/admin/cellphone/admin_cellphone_show.xhtml @@ -8,7 +8,7 @@ > - + @@ -26,7 +26,7 @@ - + @@ -79,7 +79,7 @@
  • - +
    • diff --git a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml index 0fa8d3c4..1eb5525b 100644 --- a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml +++ b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml @@ -8,7 +8,7 @@ > - + -- 2.39.5