Skip to content

Codecrew / Moya

Go to a project
Commit d46285db by Tuukka Kivilahti
Options

Merge branch 'feature-permissions' into 'master' 

i18n and fixes for feature editors

See merge request !421
2 parents 47fe7561 f28e36ff
Inline Side-by-side
Showing with 51 additions and 49 deletions
code/moya-web/WebContent/resources/cditools/role/edit.xhtml
...@@ -35,43 +35,45 @@ ...@@ -35,43 +35,45 @@
<f:selectItems var="role" itemLabel="#{role.name}" value="#{cardView.templatesWithNull}"/> <f:selectItems var="role" itemLabel="#{role.name}" value="#{cardView.templatesWithNull}"/>
</h:selectOneMenu> </h:selectOneMenu>
<h:outputText value="#{i18n['role.permissions']}"></h:outputText>
<p:dataTable style="width: auto" value="#{roleView.role.features}" var="feature">
<p:column headerText="#{i18n['feature.name']}">
<h:outputText value="#{feature.feature.name()}"/>
</p:column>
<p:column headerText="#{i18n['feature.user_permission']}">
<p:selectBooleanCheckbox value="#{feature.user}" />
</p:column>
<p:column headerText="#{i18n['feature.info_permission']}">
<p:selectBooleanCheckbox value="#{feature.info}" />
</p:column>
<p:column headerText="#{i18n['feature.admin_permission']}">
<p:selectBooleanCheckbox value="#{feature.admin}" />
</p:column>
</p:dataTable>
</h:panelGrid>
<h:commandButton rendered="#{roleView.canWriteRoles}" id="saverole" value="#{i18n['roleView.save']}" action="#{roleView.save}"/> </h:panelGrid>
<p:fieldset id="featuregroup" legend="#{i18n['role.features']}" collapsed="true" toggleable="true">
<p:dataTable id="featuretable" tableStyle="width: auto;" value="#{roleView.role.features}" var="feature">
<p:column headerText="#{i18n['feature.name']}">
<h:outputText value="#{feature.feature.name()}"/>
</p:column>
<p:column headerText="#{i18n['feature.user_permission']}">
<p:selectBooleanCheckbox value="#{feature.user}"/>
</p:column>
<p:column headerText="#{i18n['feature.info_permission']}">
<p:selectBooleanCheckbox value="#{feature.info}"/>
</p:column>
<p:column headerText="#{i18n['feature.admin_permission']}">
<p:selectBooleanCheckbox value="#{feature.admin}"/>
</p:column>
</p:dataTable>
</p:fieldset>
<p:commandButton update="roleform" rendered="#{roleView.canWriteRoles}" id="saverole" value="#{i18n['roleView.save']}" action="#{roleView.save}"/>
</h:form> </h:form>
</p> </p>
<h:form id="addmember">
<h:outputText value="#{i18n['roleView.adduser']}"/>
<p:autoComplete id="useradder" value="#{roleView.addableUser}" completeMethod="#{roleView.searchUser}" converter="#{userConverter}" var="usr" itemValue="#{usr}"
itemLabel="#{usr.shortUserDescriptor}">
<p:ajax onerror="location.reload(true);" update=":editor:addmember,:editor:memberlist" event="itemSelect" listener="#{roleView.addUser}"/>
</p:autoComplete>
</h:form>
<p:fieldset id="userfield" legend="#{i18n['roleView.members']}" toggleable="true" collapsed="true"> <p:fieldset id="userfield" legend="#{i18n['roleView.members']}" toggleable="true" collapsed="true">
<h:form id="addmember">
<h:outputText value="#{i18n['roleView.adduser']}"/>
<p:autoComplete id="useradder" value="#{roleView.addableUser}" completeMethod="#{roleView.searchUser}"
converter="#{eventUserConverter}" var="usr" itemValue="#{usr}" itemLabel="#{usr.shortUserDescriptor}">
<p:ajax onerror="location.reload(true);" update=":editor:addmember,:editor:memberlist" event="itemSelect" listener="#{roleView.addUser}"/>
</p:autoComplete>
</h:form>
<p:dataTable id="memberlist" value="#{roleView.role.users}" var="usr"> <p:dataTable id="memberlist" value="#{roleView.role.users}" var="usr">
<p:column> <p:column>
<h:outputText value="#{usr.login}"/> <h:outputText value="#{usr.login}"/>
......
code/moya-web/src/main/java/fi/codecrew/moya/graphql/MoyaGraphQLServlet.java
...@@ -283,7 +283,7 @@ public class MoyaGraphQLServlet extends HttpServlet { ...@@ -283,7 +283,7 @@ public class MoyaGraphQLServlet extends HttpServlet {
b.addField(Role_.name); b.addField(Role_.name);
b.addField(Role_.parents); b.addField(Role_.parents);
b.addField(Role_.children); b.addField(Role_.children);
b.addField(Place_.meta); b.addField(Role_.meta);
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/RoleView.java
...@@ -18,16 +18,14 @@ ...@@ -18,16 +18,14 @@
*/ */
package fi.codecrew.moya.web.cdiview.user; package fi.codecrew.moya.web.cdiview.user;
import java.util.ArrayList; import java.util.*;
import java.util.EnumMap; import java.util.stream.Collectors;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
import javax.inject.Named; import javax.inject.Named;
import fi.codecrew.moya.model.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -38,11 +36,6 @@ import fi.codecrew.moya.entitysearch.UserSearchQuery; ...@@ -38,11 +36,6 @@ import fi.codecrew.moya.entitysearch.UserSearchQuery;
import fi.codecrew.moya.enums.BortalApplication; import fi.codecrew.moya.enums.BortalApplication;
import fi.codecrew.moya.enums.apps.IAppPermission; import fi.codecrew.moya.enums.apps.IAppPermission;
import fi.codecrew.moya.enums.apps.UserPermission; import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.ApplicationPermission;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.utilities.SearchResult;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.helpers.BortalApplicationWrapper; import fi.codecrew.moya.web.helpers.BortalApplicationWrapper;
...@@ -67,7 +60,7 @@ public class RoleView extends GenericCDIView { ...@@ -67,7 +60,7 @@ public class RoleView extends GenericCDIView {
@EJB @EJB
private UserBeanLocal userbean; private UserBeanLocal userbean;
private User addableUser; private EventUser addableUser;
private static final Logger logger = LoggerFactory.getLogger(RoleView.class); private static final Logger logger = LoggerFactory.getLogger(RoleView.class);
...@@ -88,19 +81,16 @@ public class RoleView extends GenericCDIView { ...@@ -88,19 +81,16 @@ public class RoleView extends GenericCDIView {
public void addUser() public void addUser()
{ {
EventUser eu = userbean.getEventUser(addableUser, false); role = rolebean.addRole(addableUser, role);
role = rolebean.addRole(eu, role);
addableUser = null; addableUser = null;
} }
public List<User> searchUser(String user) public List<EventUser> searchUser(String user)
{ {
// By default this returns only 20 first results. // By default this returns only 20 first results.
UserSearchQuery usq = new UserSearchQuery(); UserSearchQuery usq = new UserSearchQuery();
usq.setSearch(user); usq.setSearch(user);
usq.setOnlyThisEvent(true); return userbean.getThisEventsUsers(usq).getResults();
SearchResult<User> ret = userbean.getUsers(usq);
return ret.getResults();
} }
public boolean isCanReadRoles() { public boolean isCanReadRoles() {
...@@ -224,11 +214,11 @@ public class RoleView extends GenericCDIView { ...@@ -224,11 +214,11 @@ public class RoleView extends GenericCDIView {
initPermissions(); initPermissions();
} }
public User getAddableUser() { public EventUser getAddableUser() {
return addableUser; return addableUser;
} }
public void setAddableUser(User addableUser) { public void setAddableUser(EventUser addableUser) {
this.addableUser = addableUser; this.addableUser = addableUser;
} }
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
...@@ -1928,4 +1928,9 @@ user.allroles = All users ...@@ -1928,4 +1928,9 @@ user.allroles = All users
voting.create.entrysubmitrole = Role needed to submit entries voting.create.entrysubmitrole = Role needed to submit entries
compo.filetype.name = Filetype name compo.filetype.name = Filetype name
compo.filetype.sort = Sort number compo.filetype.sort = Sort number
compo.filetype.filetype = Type compo.filetype.filetype = Type
\ No newline at end of file feature.name = Feature
feature.user_permission = User
feature.info_permission = Organizer
feature.admin_permission = Administrator
role.features = Event feature permissions
\ No newline at end of file
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -1919,4 +1919,9 @@ user.allroles = Kaikki k\ ...@@ -1919,4 +1919,9 @@ user.allroles = Kaikki k\
voting.create.entrysubmitrole = Teosten lhettmiseen tarvittava rooli voting.create.entrysubmitrole = Teosten lhettmiseen tarvittava rooli
compo.filetype.name = Tiedostotyypin nimi compo.filetype.name = Tiedostotyypin nimi
compo.filetype.sort = Jrjestysnumero compo.filetype.sort = Jrjestysnumero
compo.filetype.filetype = Tyyppi compo.filetype.filetype = Tyyppi
\ No newline at end of file feature.name = Ominaisuus
feature.user_permission = Kyttj
feature.info_permission = Jrjestj
feature.admin_permission = Pkyttj
role.features = Tapahtuman ominaisuuksien oikeudet
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!