Skip to content

GitLab

Commit a1a30cd1 authored by michael.simon's avatar michael.simon
Browse files

optics on user props page

parent 78367d28
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 21 deletions
bwreg-webapp/src/main/webapp/user/index.xhtml
View file @ a1a30cd1
......@@ -30,9 +30,18 @@
<p:selectOneListbox id="userSelect" var="u" value="#{userPropertiesBean.user}" converter="#{userConverter}" class="full">
<f:selectItems value="#{userPropertiesBean.userList}" var="user" itemLabel="#{user.eppn}" itemValue="#{user}" />
<p:column>
<h:outputText value="#{u.eppn} - " />
<h:outputText value="#{u.idp.displayName}" rendered="#{u.class.simpleName eq 'SamlUserEntity'}" />
<h:outputText value="#{u.issuer.displayName}" rendered="#{u.class.simpleName eq 'OidcUserEntity'}" />
<p:outputPanel rendered="#{u.class.simpleName eq 'SamlUserEntity'}">
<h:outputText value="#{u.eppn} - " rendered="#{u.eppn != null}"/>
<h:outputText value="#{u.email} - " rendered="#{u.eppn == null and u.email != null}"/>
<h:outputText value="#{u.persistentId} - " rendered="#{u.eppn == null and u.email == null}"/>
<h:outputText value="#{u.idp.displayName}" />
</p:outputPanel>
<p:outputPanel rendered="#{u.class.simpleName eq 'OidcUserEntity'}">
<h:outputText value="#{u.eppn} - " rendered="#{u.eppn != null}"/>
<h:outputText value="#{u.email} - " rendered="#{u.eppn == null and u.email != null}"/>
<h:outputText value="#{u.subjectId} - " rendered="#{u.eppn == null and u.email == null}"/>
<h:outputText value="#{u.issuer.displayName}" />
</p:outputPanel>
</p:column>
<f:ajax render=":form:tabVw" execute="@this" />
</p:selectOneListbox>
......@@ -41,27 +50,58 @@
<p:tab id="tab1" title="#{messages.my_data}" rendered="#{userPropertiesBean.user.class.simpleName eq 'SamlUserEntity'}">
<div class="panel">#{messages.my_data_explanation}</div>
<div class="panel">#{messages.data_from}: <b>#{userPropertiesBean.user.idp.orgName}</b></div>
<p:panelGrid id="baseData" columns="2">
<bw:outputText label="#{messages.name}" value="#{userPropertiesBean.user.surName}, #{userPropertiesBean.user.givenName}"/>
<bw:outputText label="#{messages.email}" value="#{userPropertiesBean.user.email}"/>
<bw:outputText label="#{messages.eppn}" value="#{userPropertiesBean.user.eppn}"/>
<bw:outputText label="#{messages.persistent_id}" value="#{userPropertiesBean.user.persistentId}" rendered="#{userPropertiesBean.user.class eq 'SamlUserEntity'}"/>
<bw:outputText label="#{messages.uid_number}" value="#{userPropertiesBean.user.uidNumber}"/>
<bw:outputText label="#{messages.primary_group}" value="#{userPropertiesBean.user.primaryGroup.name} (#{userPropertiesBean.user.primaryGroup.gidNumber})"/>
<bw:outputText label="#{messages.idp}" value="#{userPropertiesBean.user.idp.displayName}"
rendered="#{not empty userPropertiesBean.user.idp and not empty userPropertiesBean.user.idp.displayName}"/>
<p:panelGrid columns="2">
<h:outputLabel value="#{messages.name}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.surName}, #{userPropertiesBean.user.givenName}"/>
<h:outputLabel value="#{messages.email}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.email}"/>
<h:outputLabel value="#{messages.eppn}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.eppn}"/>
<h:outputLabel value="#{messages.persistent_id}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.persistentId}"/>
<h:outputLabel value="#{messages.uid_number}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.uidNumber}"/>
<h:outputLabel value="#{messages.primary_group}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.primaryGroup.name} (#{userPropertiesBean.user.primaryGroup.gidNumber})"/>
<h:outputLabel value="#{messages.idp}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.idp.displayName}" rendered="#{not empty userPropertiesBean.user.idp and not empty userPropertiesBean.user.idp.displayName}"/>
</p:panelGrid>
<div style="margin-top: 0.8em;">#{messages.my_data_delete_all}
</div>
<div style="margin-top: 0.8em;" class="text">
<h:link outcome="/user/delete-all-personal-data.xhtml" value="#{messages.my_data_delete_all_link}" styleClass="link">
</h:link>
</div>
</p:tab>
<p:tab id="tab2" title="#{messages.shibboleth}">
<p:tab id="tab1_1" title="#{messages.my_data}" rendered="#{userPropertiesBean.user.class.simpleName eq 'OidcUserEntity'}">
<div class="panel">#{messages.my_data_explanation}</div>
<div class="panel">#{messages.data_from}: <b>#{userPropertiesBean.user.issuer.displayName}</b></div>
<p:panelGrid columns="2">
<h:outputLabel value="#{messages.name}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.surName}, #{userPropertiesBean.user.givenName}"/>
<h:outputLabel value="#{messages.email}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.email}"/>
<h:outputLabel value="#{messages.eppn}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.eppn}"/>
<h:outputLabel value="#{messages.subject_id}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.subjectId}"/>
<h:outputLabel value="#{messages.uid_number}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.uidNumber}"/>
<h:outputLabel value="#{messages.primary_group}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.primaryGroup.name} (#{userPropertiesBean.user.primaryGroup.gidNumber})"/>
<h:outputLabel value="#{messages.oidc_op}" for="@next" />
<h:outputText value="#{userPropertiesBean.user.issuer.displayName}"/>
</p:panelGrid>
</p:tab>
<p:tab id="tab2" title="#{messages.shibboleth}" rendered="#{userPropertiesBean.user.class.simpleName eq 'SamlUserEntity'}">
<div class="panel">#{messages.my_data_from_saml} #{of:formatDate(userPropertiesBean.user.lastUpdate, 'dd.MM.yyyy HH:mm')}</div>
<p:dataTable id="attrData" style="min-width: 500px;"
value="#{userPropertiesBean.user.attributeStore.keySet().toArray()}" var="key">
......@@ -101,6 +141,12 @@
</p:tab>
</p:tabView>
<div class="text full" style="margin-top: 0.8em;">#{messages.my_data_delete_all}
<br/>
<h:link outcome="/user/delete-all-personal-data.xhtml" value="#{messages.my_data_delete_all_link}" styleClass="link">
</h:link>
</div>
<div class="text full" style="margin-top: 0.4em;">
<a href="../index.xhtml"><h:outputText value="#{messages.back}"/></a>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment