From: Roland Häder Date: Tue, 29 Aug 2017 21:53:20 +0000 (+0200) Subject: Please cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0f43c3335f918c245d522e3ef2952f3cfdffbd5e;p=jfinancials-war.git Please cherry-pick: - added optional parameter "contact" to many custom JSF tags - removed no longer needed error messages as the template has become a custom JSF tag - still having some StackoverflowError e.g. in view admin_landline_show.xhtml Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 2ba87ecc..328ea08c 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -375,7 +375,6 @@ ADMIN_SHOW_PHONE_ID=Id-Nummer: ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobilanbieter: ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Komplette Nummer: ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative Links: -ERROR_PARAMETER_USER_NOT_SET=Fehler: Parameter 'user' nicht gesetzt. ADMIN_LINK_SHOW_SHORT=Anzeigen ADMIN_LINK_SHOW_SHORT_TITLE=Eintrag einzelnt anzeigen. ADMIN_LINK_EDIT_SHORT=Editieren @@ -429,9 +428,7 @@ ADMIN_LINK_SHOW_CONTACT_DATA_TITLE=Kontaktdaten anzeigen ADMIN_MENU_CONTACT_TITLE=Kontaktdaten LINK_ADMIN_LIST_CONTACT=Kontaktdaten auflisten LINK_ADMIN_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden. -ERROR_PARAMETER_MOBILE_NUMBER_CONTACT_NOT_SET=Fehler: Parameter 'mobileNumber' und 'contact' nicht gesetzt. ADMIN_ADD_CONTACT_MINIMUM_DATA=Bitte geben Sie mindestens Anrede, Vorname und Nachname an. -ERROR_PARAMETER_CONTACT_NOT_SET=Fehler: Parameter 'contact' nicht gesetzt. ADMIN_HEADER_SHOW_CONTACT=Kontaktdaten f\u00fcr {0}: ADMIN_CONTACT_UPDATED=Kontaktdaten aktualisiert: ADMIN_LINK_DELETE_CONTACT=Kontaktdaten l\u00f6schen diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 8e848db5..fdc24c02 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -354,7 +354,6 @@ ADMIN_SHOW_PHONE_ID=Id number: ADMIN_SHOW_MOBILE_PROVIDER_NAME=Mobile provider: ADMIN_SHOW_MOBILE_NUMBER_COMPLETE=Complete number: ADMIN_SHOW_ADMINISTRATIVE_LINKS=Administrative links: -ERROR_PARAMETER_USER_NOT_SET=Error: Parameter 'user' not set. ADMIN_LINK_SHOW_SHORT=Show ADMIN_LINK_SHOW_SHORT_TITLE=Show single entry. ADMIN_LINK_EDIT_SHORT=Edit @@ -407,7 +406,6 @@ ADMIN_LINK_SHOW_CONTACT_DATA_TITLE=Show contact data ADMIN_MENU_CONTACT_TITLE=Manage contact data LINK_ADMIN_LIST_CONTACT=List contact data LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created. -ERROR_PARAMETER_MOBILE_NUMBER_CONTACT_NOT_SET=Error: Parameter 'mobileNumber' and 'contact' are not set. ADMIN_ADD_CONTACT_MINIMUM_DATA=Please enter at least salutation, first name and family name. ERROR_PARAMETER_CONTACT_NOT_SET=Error: Parameter 'contact' is not set. ADMIN_HEADER_SHOW_CONTACT=Contact data for {0}: diff --git a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl index 4d773ad2..980c533e 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/fax/admin_form_fax_data.tpl @@ -6,7 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
diff --git a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl index 8461e52e..ec1bf0a8 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/landline/admin_form_landline_data.tpl @@ -6,7 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
diff --git a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl index 6e454c15..9e8571c3 100644 --- a/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl +++ b/web/WEB-INF/resources/tags/admin/form_data/mobile/admin_form_mobile_data.tpl @@ -6,7 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
diff --git a/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl b/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl index c9bb240e..22ab97e7 100644 --- a/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/fax/admin_fax_links.tpl @@ -6,40 +6,36 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - - - - diff --git a/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl b/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl index ec0c7db3..426fcda1 100644 --- a/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/landline/admin_landline_links.tpl @@ -6,30 +6,28 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - - - + diff --git a/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl b/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl index fa27d6ee..eb5a81d0 100644 --- a/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mobile/admin_mobile_links.tpl @@ -6,38 +6,36 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - - 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 622573d2..2c376018 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 @@ -6,7 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + @@ -43,11 +43,11 @@ - +
- +
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 8017577e..66a22eba 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 @@ -6,9 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - - - + @@ -45,11 +43,11 @@
- +
- +
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 d936316a..4077b5fa 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 @@ -6,7 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + @@ -52,11 +52,11 @@
- +
- +
diff --git a/web/WEB-INF/resources/tags/messages/message_box.tpl b/web/WEB-INF/resources/tags/messages/message_box.tpl index 95b819ab..a68d361f 100644 --- a/web/WEB-INF/resources/tags/messages/message_box.tpl +++ b/web/WEB-INF/resources/tags/messages/message_box.tpl @@ -5,7 +5,7 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"> - +
diff --git a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl index bc181b04..5c114779 100644 --- a/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl +++ b/web/WEB-INF/resources/tags/profile/user/user_profile_link.tpl @@ -6,8 +6,6 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - - diff --git a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl index 2a7575f2..a6543fec 100644 --- a/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl +++ b/web/WEB-INF/resources/tags/table_rows/fax_input_table_row.tpl @@ -6,7 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
diff --git a/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl index 624ef2d9..f16751bb 100644 --- a/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl +++ b/web/WEB-INF/resources/tags/table_rows/landline_input_table_row.tpl @@ -6,7 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
diff --git a/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl index 3d6fc071..9e981a08 100644 --- a/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl +++ b/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl @@ -6,7 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
diff --git a/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl index 025265be..387a7235 100644 --- a/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl +++ b/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl @@ -6,7 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
diff --git a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl index b51146ab..96d53b29 100644 --- a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl +++ b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl @@ -6,7 +6,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - +
diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml index 11287cce..2bcbbc6a 100644 --- a/web/WEB-INF/widgets.jsf.taglib.xml +++ b/web/WEB-INF/widgets.jsf.taglib.xml @@ -227,6 +227,12 @@ along with this program. If not, see . true org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber + + contact + The contact instance that provides contact data for additional JSF links. + false + org.mxchange.jcontacts.contact.Contact + rendered Whether this tag is being rendered by JSF engine. @@ -256,6 +262,12 @@ along with this program. If not, see . true org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber + + contact + The contact instance that provides contact data for additional JSF links. + false + org.mxchange.jcontacts.contact.Contact + rendered Whether this tag is being rendered by JSF engine. @@ -285,6 +297,12 @@ along with this program. If not, see . true org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber + + contact + The contact instance that provides contact data for additional JSF links. + false + org.mxchange.jcontacts.contact.Contact + rendered Whether this tag is being rendered by JSF engine. @@ -362,6 +380,12 @@ along with this program. If not, see . true org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber + + contact + The contact instance that provides contact data for additional JSF links. + false + org.mxchange.jcontacts.contact.Contact + rendered Whether this tag is being rendered by JSF engine. @@ -385,6 +409,12 @@ along with this program. If not, see . true org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber + + contact + The contact instance that provides contact data for additional JSF links. + false + org.mxchange.jcontacts.contact.Contact + rendered Whether this tag is being rendered by JSF engine. @@ -408,6 +438,12 @@ along with this program. If not, see . true org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber + + contact + The contact instance that provides contact data for additional JSF links. + false + org.mxchange.jcontacts.contact.Contact + rendered Whether this tag is being rendered by JSF engine. diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml index 34f45fa8..0efea096 100644 --- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml +++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml @@ -45,7 +45,7 @@
- +
- +
- +