From: Roland Häder Date: Mon, 22 Aug 2016 13:18:40 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=81eb4c365720185bffc8f0a01de7e8ae3db777bd;p=jjobs-war.git Please cherry-pick: - removed onPostback from "edit pages" (as if this is set, the old data is being set back ... yes, remember the JSF life-cycle - added error message when no data has been changed (generic) - added missing navigation rule - added noisy debug lines --- diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java index 6525d927..22ae9972 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java @@ -252,6 +252,9 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements @Override public String editMobileData () { + // Log message + System.out.println(MessageFormat.format("{0}.editMobileData: CALLED!", this.getClass().getSimpleName())); //NOI18N + // Is all data set if (this.beanHelper.getMobileNumber() == null) { // Not set, throw NPE @@ -293,8 +296,17 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements return ""; //NOI18N } + // Log message + System.out.println(MessageFormat.format("{0}.editMobileData: this.mobileProvider.providerId={1},this.beanHelper.mobileNumber.mobileProvider.providerId={2},this.phoneNumber={3},this.beanHelper.mobileNumber.phoneNumber={4}", this.getClass().getSimpleName(), this.getMobileProvider().getProviderId(), this.beanHelper.getMobileNumber().getMobileProvider().getProviderId(), this.getPhoneNumber(), this.beanHelper.getMobileNumber().getPhoneNumber())); //NOI18N + // Is the mobile provider and number the same? if ((Objects.equals(this.getMobileProvider(), this.beanHelper.getMobileNumber().getMobileProvider())) && (Objects.equals(this.getPhoneNumber(), this.beanHelper.getMobileNumber().getPhoneNumber()))) { + // Log message + System.out.println(MessageFormat.format("{0}.editMobileData: No difference - EXIT!", this.getClass().getSimpleName())); //NOI18N + + // Show message + this.showFacesMessage("form_edit_mobile:mobileNumber", "ERROR_ADMIN_NO_CHANGE_ENTERED"); //NOI18N + // No difference in both together, no need to edit return ""; //NOI18N } @@ -310,7 +322,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements this.mobileNumberUpdatedEvent.fire(new AdminMobileNumberUpdatedEvent(updatedNumber)); // All fine, redirect - return "admin_edit_mobile"; //NOI18N + return "admin_show_mobile"; //NOI18N } @Override @@ -384,6 +396,7 @@ public class JobsAdminPhoneWebRequestBean extends BaseJobsController implements @Override public void setPhoneNumber (final Long phoneNumber) { + System.out.println(MessageFormat.format("{0}: Setting phoneNumber={1},previous:{2}", this.getClass().getSimpleName(), phoneNumber, this.phoneNumber)); this.phoneNumber = phoneNumber; } diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 1daaa2ec..1baa1a4f 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -708,3 +708,4 @@ ERROR_ADMIN_NO_PHONE_AREA_CODE_ENTERED=Keine Ortsvorwahl eingegeben. ERROR_ADMIN_NO_PHONE_NUMBER_ENTERED=Keine Rufnummer eingegeben. ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER=Festnetznummer: PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER=Mobilfunknummern auflisten +ERROR_ADMIN_NO_CHANGE_ENTERED=Selben Daten wurden abgeschickt, keine \u00c4nderung durchfgef\u00fchrt. diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index efc553eb..fbcc51bf 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -708,3 +708,4 @@ ERROR_ADMIN_NO_PHONE_AREA_CODE_ENTERED=No city (area) dial prefix entered. ERROR_ADMIN_NO_PHONE_NUMBER_ENTERED=No call number entered. ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER=Land-line number: PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER=List mobile numbers +ERROR_ADMIN_NO_CHANGE_ENTERED=Same data has been sent, no change done. diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 200a86a2..71cf4042 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -478,6 +478,24 @@ /admin/landline/admin_landline_delete.xhtml + + /admin/mobile/admin_mobile_delete.xhtml + + admin_show_mobile_provider + /admin/mobile_provider/admin_mobile_provider_show.xhtml + + + admin_list_mobile + /admin/mobile/admin_mobile_list.xhtml + + + + /admin/mobile/admin_mobile_edit.xhtml + + admin_show_mobile + /admin/mobile/admin_mobile_show.xhtml + + /admin/mobile/admin_mobile_list.xhtml diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml index c973a90c..ecb3d09d 100644 --- a/web/admin/contact/admin_contact_edit.xhtml +++ b/web/admin/contact/admin_contact_edit.xhtml @@ -11,7 +11,7 @@ - + diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml index 20e186d6..920737e3 100644 --- a/web/admin/fax/admin_fax_edit.xhtml +++ b/web/admin/fax/admin_fax_edit.xhtml @@ -11,7 +11,7 @@ - + diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml index c29fca9a..fdde99c1 100644 --- a/web/admin/landline/admin_landline_edit.xhtml +++ b/web/admin/landline/admin_landline_edit.xhtml @@ -11,7 +11,7 @@ - + diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml index 09f436e4..88aef070 100644 --- a/web/admin/mobile/admin_mobile_edit.xhtml +++ b/web/admin/mobile/admin_mobile_edit.xhtml @@ -10,7 +10,7 @@ - + diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml index be0d4472..083296fa 100644 --- a/web/admin/user/admin_user_edit.xhtml +++ b/web/admin/user/admin_user_edit.xhtml @@ -12,7 +12,7 @@ - +