Please cherry-pick:

- allow this tag to be not rendered (for conditional rendering very important)

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
index 964049c036773759c39b85381e960be222f0dd4b..3ec8a69c8ccac408d5af1ebc4cb126630408992b 100644 (file)
--- a/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/resources/tags/admin/form_data/contact/admin_form_contact_data.tpl
@@ -6,7 +6,7 @@
        xmlns:h="http://xmlns.jcp.org/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGroup styleClass="para" layout="block">
+       <h:panelGroup styleClass="para" layout="block" rendered="#{empty rendered or rendered}">
                <fieldset class="fieldset" id="personal_data">
                        <legend title="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND_TITLE}">
                                <h:outputText value="#{msg.ADMIN_CONTACT_PERSONAL_DATA_LEGEND}" />

diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml
index 2bcbbc6a1e75861d885edd9bc9a1a44ba20b7671..cd5476569d45fc4601956e94225bde13f295ba88 100644 (file)
--- a/web/WEB-INF/widgets.jsf.taglib.xml
+++ b/web/WEB-INF/widgets.jsf.taglib.xml
@@ -137,6 +137,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                        <required>false</required>
                        <type>java.lang.Boolean</type>
                </attribute>
+               <attribute>
+                       <name>rendered</name>
+                       <description>Whether this tag is being rendered by JSF engine.</description>
+                       <required>false</required>
+                       <type>java.lang.Boolean</type>
+               </attribute>
        </tag>
        <tag>
                <tag-name>outputAdminFaxDataFormFields</tag-name>