From 6b125c532feeb0dac799bfe66dac87fbe28dff44 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Fri, 14 May 2021 17:52:47 +0200 Subject: [PATCH] Template for create and edit step for postal address assets --- .../assets/PostalAddressCreateStep.java | 114 +++++++-- .../assets/PostalAddressEditStep.java | 11 +- .../ui/contentsection/assets/editstep.xhtml | 21 ++ .../postaladdress/create-postaladdress.xhtml | 102 ++++++++ .../postaladdress/edit-postaladdress.xhtml | 222 ++++++++++++++++++ .../article/article-basic-properties.xhtml | 2 +- .../ui/MvcAssetStepsBundle.properties | 62 +++++ .../ui/MvcAssetStepsBundle_de.properties | 62 +++++ 8 files changed, 567 insertions(+), 29 deletions(-) create mode 100644 ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/editstep.xhtml diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PostalAddressCreateStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PostalAddressCreateStep.java index 596c6bfe7..53fccf45a 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PostalAddressCreateStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PostalAddressCreateStep.java @@ -24,8 +24,10 @@ import org.librecms.assets.PostalAddress; import org.librecms.contentsection.AssetManager; import org.librecms.contentsection.AssetRepository; +import java.util.Arrays; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; @@ -44,18 +46,34 @@ public class PostalAddressCreateStep private static final String FORM_PARAMS_NAME = "name"; private static final String FORM_PARAMS_TITLE = "title"; - + private static final String FORM_PARAM_INITIAL_LOCALE = "locale"; @Inject private AssetManager assetManager; - + @Inject private AssetRepository assetRepo; - + @Inject private GlobalizationHelper globalizationHelper; + private String name; + + private String title; + + private String initialLocale; + + private String address; + + private String postalCode; + + private String city; + + private String state; + + private String isoCountryCode; + @Override public String showCreateStep() { return "/org/librecms/ui/assets/postaladdress/create-postaladdress.xhtml"; @@ -76,14 +94,14 @@ public class PostalAddressCreateStep ); return showCreateStep(); } - - final String name = formParams.get(FORM_PARAMS_NAME)[0]; + + name = formParams.get(FORM_PARAMS_NAME)[0]; if (!name.matches("^([a-zA-Z0-9_-]*)$")) { addMessage( "danger", globalizationHelper - .getLocalizedTextsUtil(getBundle()) - .getText("postaladdress.createstep.name.error.invalid") + .getLocalizedTextsUtil(getBundle()) + .getText("postaladdress.createstep.name.error.invalid") ); return showCreateStep(); } @@ -99,8 +117,8 @@ public class PostalAddressCreateStep ); return showCreateStep(); } - final String title = formParams.get(FORM_PARAMS_TITLE)[0]; - + title = formParams.get(FORM_PARAMS_TITLE)[0]; + if (!formParams.containsKey(FORM_PARAM_INITIAL_LOCALE) || formParams.get(FORM_PARAM_INITIAL_LOCALE) == null || formParams.get(FORM_PARAM_INITIAL_LOCALE).length == 0) { @@ -112,32 +130,31 @@ public class PostalAddressCreateStep ); return showCreateStep(); } - final Locale locale = new Locale( - formParams.get(FORM_PARAM_INITIAL_LOCALE)[0] - ); - - final String address = formParams.get("address")[0]; - final String postalCode = formParams.get("postalCode")[0]; - final String city = formParams.get("city")[0]; - final String state = formParams.get("state")[0]; - final String isoCountryCode = formParams.get("isoCountryCode")[0]; - + initialLocale = formParams.get(FORM_PARAM_INITIAL_LOCALE)[0]; + final Locale locale = new Locale(initialLocale); + + address = formParams.get("address")[0]; + postalCode = formParams.get("postalCode")[0]; + city = formParams.get("city")[0]; + state = formParams.get("state")[0]; + isoCountryCode = formParams.get("isoCountryCode")[0]; + final PostalAddress postalAddress = assetManager.createAsset( - name, + name, title, - locale, - getFolder(), + locale, + getFolder(), PostalAddress.class ); - + postalAddress.setAddress(address); postalAddress.setPostalCode(postalCode); postalAddress.setCity(city); postalAddress.setState(state); postalAddress.setIsoCountryCode(isoCountryCode); - + assetRepo.save(postalAddress); - + return String.format( "redirect:/%s/assets/%s/%s/@postaladdress-edit", getContentSectionLabel(), @@ -145,7 +162,6 @@ public class PostalAddressCreateStep name ); } - @Override public String getAssetType() { @@ -171,4 +187,50 @@ public class PostalAddressCreateStep return MvcAssetStepsConstants.BUNDLE; } + public String getName() { + return name; + } + + public String getTitle() { + return title; + } + + public String getInitialLocale() { + return initialLocale; + } + + public String getAddress() { + return address; + } + + public String getPostalCode() { + return postalCode; + } + + public String getCity() { + return city; + } + + public String getState() { + return state; + } + + public String getIsoCountryCode() { + return isoCountryCode; + } + + public Map getCountries() { + return Arrays + .stream(Locale.getISOCountries()) + .map(country -> new Locale(country)) + .collect( + Collectors.toMap( + Locale::toString, + locale -> locale.getDisplayCountry( + globalizationHelper.getNegotiatedLocale() + ) + ) + ); + } + } diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PostalAddressEditStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PostalAddressEditStep.java index 6a6304a42..59ba7d3ed 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PostalAddressEditStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/PostalAddressEditStep.java @@ -324,6 +324,12 @@ public class PostalAddressEditStep extends AbstractMvcAssetEditStep { public String getIsoCountryCode() { return getPostalAddress().getIsoCountryCode(); } + + public String getCountry() { + return new Locale(getPostalAddress() + .getIsoCountryCode()) + .getDisplayCountry(globalizationHelper.getNegotiatedLocale()); + } @POST @Path("/properties") @@ -374,8 +380,9 @@ public class PostalAddressEditStep extends AbstractMvcAssetEditStep { .collect( Collectors.toMap( Locale::toString, - locale -> locale.getDisplayCountry(globalizationHelper - .getNegotiatedLocale()) + locale -> locale.getDisplayCountry( + globalizationHelper.getNegotiatedLocale() + ) ) ); } diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/editstep.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/editstep.xhtml new file mode 100644 index 000000000..53b2dd9b7 --- /dev/null +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/editstep.xhtml @@ -0,0 +1,21 @@ +]> + + + + + + + + + + + + + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/postaladdress/create-postaladdress.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/postaladdress/create-postaladdress.xhtml index 8b1378917..40a470361 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/postaladdress/create-postaladdress.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/postaladdress/create-postaladdress.xhtml @@ -1 +1,103 @@ +]> + + + +
+

#{CmsAssetsStepsDefaultMessagesBundle["postaladdress.createform.title"]}

+ + + + + +
+ + + + + + + + + + + + + + + + + + #{CmsAssetsStepsDefaultMessagesBundle['createform.cancel']} + + + + + +
+ + + + diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/postaladdress/edit-postaladdress.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/postaladdress/edit-postaladdress.xhtml index 8b1378917..6123d1d66 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/postaladdress/edit-postaladdress.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/postaladdress/edit-postaladdress.xhtml @@ -1 +1,223 @@ +]> + + +

#{CmsAssetsStepsDefaultMessagesBundle.getMessage('postaladdress.editstep.header', [CmsPostalAddressEditStep.name])}

+ +

#{CmsAssetsStepsDefaultMessagesBundle['editstep.name.header']}

+
+ 
#{CmsPostalAddressEditStep.name}
+ + + +
+ + + + + + + +

#{CmsAssetsStepsDefaultMessagesBundle['postaladdress.editstep.properties.header']}

+ + +
+ +
+ + +
+
+
#{CmsAssetsStepsDefaultMessagesBundle['postaladdress.editstep.properties.address.label']}
+
#{CmsPostalAddressEditStep.address}
+
+
+
#{CmsAssetsStepsDefaultMessagesBundle['postaladdress.editstep.properties.postal_code.label']}
+
#{CmsPostalAddressEditStep.postalCode}
+
+
+
#{CmsAssetsStepsDefaultMessagesBundle['postaladdress.editstep.properties.city.label']}
+
#{CmsPostalAddressEditStep.city}
+
+
+
#{CmsAssetsStepsDefaultMessagesBundle['postaladdress.editstep.properties.state.label']}
+
#{CmsPostalAddressEditStep.state}
+
+
+
#{CmsAssetsStepsDefaultMessagesBundle['postaladdress.editstep.properties.country.label']}
+
#{CmsPostalAddressEditStep.country}
+
+
+ + + + \ No newline at end of file diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-basic-properties.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-basic-properties.xhtml index 800c1c708..965f01e68 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-basic-properties.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-basic-properties.xhtml @@ -44,7 +44,7 @@ class="close" data-dismiss="modal" type="button"> - +
diff --git a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties index e574b0d5d..acba33ee3 100644 --- a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties +++ b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties @@ -1,3 +1,65 @@ create_step=Access denied asset.edit.denied=Access denied. +postaladdress.createform.title=Create new postal address +createform.name.help=The name of the new asset. Can only contain the letters a to z, A to Z, numbers, the underscore and the dash. +createform.name.label=Name +createform.initial_locale.help=Initial locale of the new asset. +createform.initial_locale.label=Language +createform.title.help=The title of the new asset. +createform.title.label=Title +createform.postaladdress.address.help=Additional address lines of the postal address, eg. Building K, Floor 42. +createform.postaladdress.address.label=Additional address lines +createform.postaladdress.postalcode.help=The postal code of the address. +createform.postaladdress.postalcode.label=Postal Code +createform.postaladdress.city.help=The city part of the address. +createform.postaladdress.city.label=City +createform.postaladdress.state.help=The state part of the address. Not relevant for most countries. +createform.postaladdress.state.label=State +createform.postaladdress.country.help=The country part of the address. +createform.postaladdress.country.label=Country +createform.cancel=Cancel +createform.submit=Create asset +postaladdress.editstep.header=Edit postal address {0} +editstep.name.header=Name +editstep.name.edit=Rename asset +editstep.name.edit.title=Rename asset +editstep.name.edit.close=Cancel +editstep.name.help=The name of the asset. Can only contain the letters a to z, A to Z, numbers, the underscore and the dash. +editstep.name.label=Name +editstep.name.submit=Rename asset +editstep.title.add_button.label=Add localized title +editstep.title.add.cancel=Cancel +editstep.title.add.locale.help=The locale of the new localized title. +editstep.title.add.locale.label=Locale +editstep.title.add.submit=Add localized title +editstep.title.add.header=Add localized title +editstep.title.add.value.help=The new localized title. +editstep.title.add.value.label=Title +editstep.title.edit=Edit +editstep.title.edit.cancel=Cancel +editstep.title.edit.submit=Save +editstep.title.edit.header=Edit localized title +editstep.title.edit.value.help=The localized title. +editstep.title.edit.value.label=Title +editstep.title.remove=Remove +editstep.title.remove.cancel=Cancel +editstep.title.remove.submit=Remove +editstep.title.remove.text=Are you sure to remvoe the following localized title? +editstep.title.remove.title=Remove localized title +editstep.title.header=Asset Title +postaladdress.editstep.properties.header=Postal Address Properties +postaladdress.editstep.properties.edit=Edit properties +postaladdress.editstep.properties.edit.title=Edit postal address properties +postaladdress.editstep.properties.edit.close=Cancel +postaladdress.editstep.properties.edit.address.help=Additional address lines of the postal address, eg. Building K, Floor 42. +postaladdress.editstep.properties.address.label=Additional address lines +postaladdress.editstep.properties.edit.postal_code.help=The postal code of the address. +postaladdress.editstep.properties.postal_code.label=Postal code +postaladdress.editstep.properties.edit.city.help=The city part of the address. +postaladdress.editstep.properties.city.label=City +postaladdress.editstep.properties.edit.state.help=The postal code of the address. +postaladdress.editstep.properties.state.label=State +postaladdress.editstep.properties.edit.country.help=The country part of the address. +postaladdress.editstep.properties.country.label=Country +postaladdress.editstep.properties.edit.submit=Save diff --git a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties index e1558d64c..f0321d1ba 100644 --- a/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties +++ b/ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties @@ -1,3 +1,65 @@ create_step=Zugriff verweigert asset.edit.denied=Zugriff verweigert +postaladdress.createform.title=Neue Postanschrift anlegen +createform.name.help=Der Name des neuen Assets. Darf nur die Buchstaben a bis z, A bis Z, Zahlen, den Unterstrich und den Bindestrich enthalten. +createform.name.label=Name +createform.initial_locale.help=Initiale Sprache des neuen Assets. +createform.initial_locale.label=Sprache +createform.title.help=Der Titel des neuen Assets. +createform.title.label=Titel +createform.postaladdress.address.help=Zus\u00e4tzliche Angaben f\u00fcr die Adresse, z.B. Geb\u00e4ude K, Ebene 42. +createform.postaladdress.address.label=Zus\u00e4tzliche Angaben +createform.postaladdress.postalcode.help=Die Postleitzahl der Adresse. +createform.postaladdress.postalcode.label=Postleitzahl +createform.postaladdress.city.help=Die Stadt- oder Ortsangabe der Adresse. +createform.postaladdress.city.label=Ort +createform.postaladdress.state.help=Angabe des Bundesstaates. F\u00fcr die meisten L\u00e4nder nicht notwendig. +createform.postaladdress.state.label=Bundesstaat +createform.postaladdress.country.help=Das Land, in dem sich die Adresse befindet. +createform.postaladdress.country.label=Land +createform.cancel=Abbrechen +createform.submit=Asset anlegen +postaladdress.editstep.header=Postanschrift {0} bearbeiten +editstep.name.header=Name +editstep.name.edit=Asset umbenennen +editstep.name.edit.title=Asset umbenennen +editstep.name.edit.close=Abbrechen +editstep.name.help=Der Name des Assets. Darf nur die Buchstaben a bis z, A bis Z, Zahlen, den Unterstrich und den Bindestrich enthalten. +editstep.name.label=Name +editstep.name.submit=Asset umbenennen +editstep.title.add_button.label=Lokalisierten Titel hinzuf\u00fcgen +editstep.title.add.cancel=Abbrechen +editstep.title.add.locale.help=Die Sprache des neuen lokalisierten Titels. +editstep.title.add.locale.label=Sprache +editstep.title.add.submit=Lokalisierten Titel hinzuf\u00fcgen +editstep.title.add.header=Lokalisierten Titel hinzuf\u00fcgen +editstep.title.add.value.help=Der neue lokalisierte Titel. +editstep.title.add.value.label=Titel +editstep.title.edit=Bearbeiten +editstep.title.edit.cancel=Abbrechen +editstep.title.edit.submit=Speichern +editstep.title.edit.header=Lokalisierten Titel bearbeiten +editstep.title.edit.value.help=Der lokalisierte Titel. +editstep.title.edit.value.label=Titel +editstep.title.remove=Entfernen +editstep.title.remove.cancel=Abbrechen +editstep.title.remove.submit=Entfernen +editstep.title.remove.text=Sind Sie sicher, dass Sie diesen lokaliserten Titel entfernen wollen? +editstep.title.remove.title=Remove localized title +editstep.title.header=Asset Titel +postaladdress.editstep.properties.header=Eigenschaften der Postanschrift +postaladdress.editstep.properties.edit=Eigenschaften bearbeiten +postaladdress.editstep.properties.edit.title=Eigenschaften der Postanschrift bearbeiten +postaladdress.editstep.properties.edit.close=Abbrechen +postaladdress.editstep.properties.edit.address.help=Zus\u00e4tzliche Angaben f\u00fcr die Adresse, z.B. Geb\u00e4ude K, Ebene 42. +postaladdress.editstep.properties.address.label=Zus\u00e4tzliche Angaben +postaladdress.editstep.properties.edit.postal_code.help=Die Postleitzahl der Adresse. +postaladdress.editstep.properties.postal_code.label=Postleitzahl +postaladdress.editstep.properties.edit.city.help=Die Stadt- oder Ortsangabe der Adresse. +postaladdress.editstep.properties.city.label=Ort +postaladdress.editstep.properties.edit.state.help=Die Postleitzahl der Adresse. +postaladdress.editstep.properties.state.label=Bundesstaat +postaladdress.editstep.properties.edit.country.help=Das Land, in dem sich die Adresse befindet. +postaladdress.editstep.properties.country.label=Land +postaladdress.editstep.properties.edit.submit=Speichern