Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Antti Väyrynen
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 1f54747e
authored
Dec 20, 2015
by
Tuomas Riihimäki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
role reference from cardtemplate was removed, but it was still used in few pages.
1 parent
705f45f5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
18 deletions
code/moya-web/WebContent/useradmin/editCardTemplate.xhtml
code/moya-web/WebContent/useradmin/listCardTemplates.xhtml
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/RoleView.java
code/moya-web/WebContent/useradmin/editCardTemplate.xhtml
View file @
1f54747
...
...
@@ -24,13 +24,6 @@
<h:inputText
id=
"power"
value=
"#{cardView.cardTemplate.power}"
size=
"4"
/>
<h:message
for=
"power"
/>
<h:outputLabel
for=
"roles"
value=
"#{i18n['cardTemplate.roles']}"
/>
<h:selectManyCheckbox
layout=
"pageDirection"
value=
"#{cardView.cardTemplate.roles}"
converter=
"#{roleConverter}"
id=
"roles"
>
<f:selectItems
var=
"role"
itemLabel=
"#{role.name}"
value=
"#{roleDataView.roles}"
/>
</h:selectManyCheckbox>
<h:message
for=
"roles"
></h:message>
</h:panelGrid>
<h:commandButton
action=
"#{cardView.saveTemplate()}"
value=
"#{i18n['cardTemplate.save']}"
/>
...
...
code/moya-web/WebContent/useradmin/listCardTemplates.xhtml
View file @
1f54747
...
...
@@ -31,16 +31,7 @@
<h:outputText
value=
"#{card.power}"
/>
</h:column>
<h:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"#{i18n['cardTemplate.roles']}"
/>
</f:facet>
<h:dataTable
value=
"#{card.roles}"
var=
"cardrole"
border=
"0"
>
<h:column>
<h:outputText
value=
"#{cardrole.name}"
/>
</h:column>
</h:dataTable>
</h:column>
<h:column>
<h:link
outcome=
"/useradmin/editCardTemplate"
value=
"#{i18n['cardTemplate.edit']}"
>
<f:param
name=
"templateid"
value=
"#{card.id}"
/>
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/RoleView.java
View file @
1f54747
...
...
@@ -157,7 +157,7 @@ public class RoleView extends GenericCDIView {
public
String
save
()
{
setRole
(
rolebean
.
mergeChanges
(
getRole
()));
return
"roleSaved"
;
return
null
;
}
public
String
savePermissions
()
{
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment