Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
reg-app
Regapp
Commits
f1e6ccd7
Commit
f1e6ccd7
authored
Oct 22, 2019
by
michael.simon
Browse files
fix problem with user admin page
No really fixed, not just hidden...
parent
f176cfed
Changes
2
Hide whitespace changes
Inline
Side-by-side
bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/ShowUserBean.java
View file @
f1e6ccd7
...
...
@@ -109,7 +109,7 @@ public class ShowUserBean implements Serializable {
}
public
void
onTransfer
(
TransferEvent
event
)
{
user
=
userService
.
findByIdWithAll
(
id
);
user
=
userService
.
findByIdWithAll
(
user
.
getId
()
);
if
(
event
.
isAdd
())
{
for
(
Object
o
:
event
.
getItems
())
{
RoleEntity
role
=
(
RoleEntity
)
o
;
...
...
@@ -122,11 +122,11 @@ public class ShowUserBean implements Serializable {
roleService
.
removeUserFromRole
(
user
,
role
.
getName
());
}
}
user
=
userService
.
findByIdWithAll
(
id
);
user
=
userService
.
findByIdWithAll
(
user
.
getId
()
);
}
public
void
updateFromIdp
()
{
user
=
userService
.
findByIdWithAll
(
id
);
user
=
userService
.
findByIdWithAll
(
user
.
getId
()
);
logger
.
info
(
"Trying user update for {}"
,
user
.
getEppn
());
if
(
user
instanceof
SamlUserEntity
)
{
...
...
@@ -148,7 +148,7 @@ public class ShowUserBean implements Serializable {
}
public
void
checkAllRegistries
()
{
user
=
userService
.
findByIdWithAll
(
id
);
user
=
userService
.
findByIdWithAll
(
user
.
getId
()
);
logger
.
info
(
"Trying to check all registries for user {}"
,
user
.
getEppn
());
List
<
RegistryEntity
>
tempRegistryList
=
new
ArrayList
<
RegistryEntity
>();
...
...
@@ -174,10 +174,6 @@ public class ShowUserBean implements Serializable {
}
public
void
setId
(
Long
id
)
{
if
(
id
!=
this
.
id
)
{
user
=
null
;
attributeMap
=
null
;
}
this
.
id
=
id
;
}
...
...
bwreg-webapp/src/main/webapp/admin/user/show-user.xhtml
View file @
f1e6ccd7
...
...
@@ -88,7 +88,8 @@
</p:panelGrid>
</p:tab>
<p:tab
id=
"tab2"
title=
"#{messages.roles}"
>
<p:pickList
var=
"role"
value=
"#{showUserBean.roleList}"
itemLabel=
"#{role.name}"
itemValue=
"#{role}"
converter=
"#{roleConverter}"
...
...
@@ -97,6 +98,7 @@
</p:pickList>
</p:tab>
<p:tab
id=
"tab3"
title=
"#{messages.saml_values}"
>
<p:dataTable
id=
"attrData"
style=
"min-width: 500px;"
value=
"#{showUserBean.entity.attributeStore.keySet().toArray()}"
var=
"key"
>
...
...
@@ -125,7 +127,7 @@
</p:ajaxStatus>
</div>
</p:tab>
<p:tab
id=
"tab4"
title=
"#{messages.registered_services}"
>
<p:dataTable
id=
"registeredTable"
var=
"registry"
value=
"#{showUserBean.registryList}"
>
<p:column>
...
...
@@ -167,7 +169,7 @@
</p:ajaxStatus>
</div>
</p:tab>
<p:tab
id=
"tab5"
title=
"#{messages.more_properties}"
>
<p:dataTable
id=
"storeData"
style=
"min-width: 500px;"
value=
"#{showUserBean.entity.genericStore.keySet().toArray()}"
var=
"key"
>
...
...
@@ -267,9 +269,11 @@
</p:column>
</p:dataTable>
</p:tab>
</p:tabView>
</div>
<p:dialog
id=
"dialog"
header=
"Detail"
showEffect=
"fade"
widgetVar=
"documentDialog"
modal=
"true"
resizable=
"true"
width=
"600px"
>
<p:outputPanel
id=
"documentPanel"
>
...
...
@@ -301,6 +305,7 @@
</p:outputPanel>
</p:dialog>
</h:form>
</ui:define>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment