Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Linnea Samila
/
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 875570b4
authored
Jun 29, 2015
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
savemessage
1 parent
a63d4213
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
10 deletions
code/moya-web/WebContent/resources/cditools/user/edit.xhtml
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserView.java
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
code/moya-web/WebContent/resources/cditools/user/edit.xhtml
View file @
875570b
...
...
@@ -170,23 +170,20 @@
</p:panelGrid>
<p:panelGrid>
<h:form
id=
"userSelectableRoles"
>
<p:fieldset
legend=
"#{i18n['user.userSelectableRoles']}"
rendered=
"#{userView.showUserSelectableRoles and cc.attrs.showRoles}"
>
<p:panelGrid
columns=
"2"
styleClass=
"noBorders"
>
<p:selectManyCheckbox
converter=
"#{roleConverter}"
layout=
"pageDirection"
value=
"#{userView.userSelectableRoles}"
>
<f:selectItems
value=
"#{roleDataView.userSelectableRoles}"
var=
"roleitem"
itemLabel=
"#{roleitem.name}"
itemValue=
"#{roleitem}"
/>
</p:selectManyCheckbox>
<div>
<h:message
rendered=
"#{roleView.canReadRoles}"
for=
"roles"
/>
</div>
</p:panelGrid>
<p:commandButton
action=
"#{userView.saveUserSelectableRoles}"
value=
"#{i18n['user.saveUserSelectableRoles']}"
/>
<p:commandButton
update=
"userSelectableRoles"
actionListener=
"#{userView.saveUserSelectableRoles}"
value=
"#{i18n['user.saveUserSelectableRoles']}"
/>
<br
/><h:outputText
rendered=
"#{userView.saveSuccess}"
styleClass=
"success"
value=
"#{i18n['user.saveSuccessfull']}"
/>
</p:fieldset>
</h:form>
</p:panelGrid>
</composite:implementation>
</html>
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserView.java
View file @
875570b
...
...
@@ -602,11 +602,17 @@ public class UserView extends GenericCDIView {
this
.
layoutview
=
layoutview
;
}
public
String
saveUserSelectableRoles
()
// we should readlly fix this facesmessages -shit
private
boolean
saveSuccess
=
false
;
public
boolean
isSaveSuccess
()
{
return
saveSuccess
;
}
public
void
saveUserSelectableRoles
()
{
rolebean
.
saveUserSelectableRoles
(
user
,
userSelectableRoles
);
addFaceMessage
(
"user.saveSuccessfull"
);
userSelectableRoles
=
null
;
return
null
;
saveSuccess
=
true
;
}
public
boolean
isShowUserSelectableRoles
()
{
...
...
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
View file @
875570b
...
...
@@ -491,6 +491,7 @@ user.info = K\u00E4ytt\u00E4j\u00E4
user.invite.placeInvite.header
=
Liit
\u
00E4 paikka itsellesi
user.meta.box.title
=
Metadata
user.roles
=
Pakotetut roolit
user.saveSuccessfull
=
Changes saved successfully
user.saveUserSelectableRoles
=
Tallenna
user.shirt.L
=
Unisex L
user.shirt.LadyL
=
Ladyfit L
...
...
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
View file @
875570b
...
...
@@ -1616,7 +1616,9 @@ user.realname = Nimi
user.roles
=
Pakotetut roolit
user.rolesave
=
Tallenna roolit
user.save
=
Tallenna
user.saveFailed
=
user.saveRoles
=
Tallenna roolit
user.saveSuccessfull
=
Tallennettu onnistuneesti
user.saveUserSelectableRoles
=
Tallenna
user.search
=
Hae
user.searchUser
=
Hae k
\u
00E4ytt
\u
00E4j
\u
00E4
\u
00E4
...
...
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