Skip to content

Codecrew / Moya

Go to a project
Commit 0ea792cf by Tuomas Riihimäki
Options

Merge branch 'permissionFixei' into 'master' 

Permission fixei

Minkä taakseen jättää...

See merge request !244
2 parents 1d11e26a 5e768953
Inline Side-by-side
Showing with 63 additions and 66 deletions
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/CardlessIncomingView.java
...@@ -18,13 +18,17 @@ ...@@ -18,13 +18,17 @@
*/ */
package fi.codecrew.moya.web.flow; package fi.codecrew.moya.web.flow;
import fi.codecrew.moya.beans.*; import fi.codecrew.moya.beans.PlaceBeanLocal;
import fi.codecrew.moya.enums.CardState; import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
import fi.codecrew.moya.beans.ProductBeanLocal;
import fi.codecrew.moya.beans.TicketBeanLocal;
import fi.codecrew.moya.enums.apps.UserPermission; import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.*; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.Product;
import fi.codecrew.moya.model.ReaderEvent;
import fi.codecrew.moya.utilities.I18n; import fi.codecrew.moya.utilities.I18n;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.reader.ReaderNameContainer;
import fi.codecrew.moya.web.cdiview.reader.ReaderView; import fi.codecrew.moya.web.cdiview.reader.ReaderView;
import fi.codecrew.moya.web.cdiview.user.UserView; import fi.codecrew.moya.web.cdiview.user.UserView;
import fi.codecrew.moya.web.helpers.ProductSummaryWrapper; import fi.codecrew.moya.web.helpers.ProductSummaryWrapper;
...@@ -39,8 +43,6 @@ import javax.faces.context.FacesContext; ...@@ -39,8 +43,6 @@ import javax.faces.context.FacesContext;
import javax.faces.model.ListDataModel; import javax.faces.model.ListDataModel;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import javax.json.JsonObject;
import java.security.acl.Group;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -78,7 +80,9 @@ public class CardlessIncomingView extends GenericCDIView { ...@@ -78,7 +80,9 @@ public class CardlessIncomingView extends GenericCDIView {
public void initView() { public void initView() {
super.beginConversation(); if (super.requirePermissions(UserPermission.MODIFY)) {
super.beginConversation();
}
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/FlowFoodwaveView.java
...@@ -18,24 +18,22 @@ ...@@ -18,24 +18,22 @@
*/ */
package fi.codecrew.moya.web.flow; package fi.codecrew.moya.web.flow;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Inject;
import javax.inject.Named;
import org.primefaces.event.SelectEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.PermissionBeanLocal; import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.enums.apps.ShopPermission;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.ReaderEvent; import fi.codecrew.moya.model.ReaderEvent;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.reader.ReaderView; import fi.codecrew.moya.web.cdiview.reader.ReaderView;
import fi.codecrew.moya.web.cdiview.shop.FoodWaveFoodView; import fi.codecrew.moya.web.cdiview.shop.FoodWaveFoodView;
import fi.codecrew.moya.web.cdiview.shop.FoodWaveView; import fi.codecrew.moya.web.cdiview.shop.FoodWaveView;
import fi.codecrew.moya.web.cdiview.shop.ProductShopView;
import fi.codecrew.moya.web.cdiview.user.UserView; import fi.codecrew.moya.web.cdiview.user.UserView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Inject;
import javax.inject.Named;
@Named @Named
@ConversationScoped @ConversationScoped
...@@ -84,13 +82,15 @@ public class FlowFoodwaveView extends GenericCDIView { ...@@ -84,13 +82,15 @@ public class FlowFoodwaveView extends GenericCDIView {
public void initFoodsView() { public void initFoodsView() {
if(userId == null || userId == 0) { if(super.requirePermissions(ShopPermission.MANAGE_FOODWAVES)) {
userView.setUserid(null); if (userId == null || userId == 0) {
} else { userView.setUserid(null);
userView.setUserid(userId); } else {
userView.setUserid(userId);
}
foodWaveFoodView.initFoodWaveFoods();
} }
foodWaveFoodView.initFoodWaveFoods();
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/FlowUserContainer.java
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
*/ */
package fi.codecrew.moya.web.flow; package fi.codecrew.moya.web.flow;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import javax.enterprise.context.SessionScoped; import javax.enterprise.context.SessionScoped;
import javax.inject.Named; import javax.inject.Named;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
/** /**
* Place to store userid between pageloads * Place to store userid between pageloads
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingView.java
...@@ -18,7 +18,18 @@ ...@@ -18,7 +18,18 @@
*/ */
package fi.codecrew.moya.web.flow; package fi.codecrew.moya.web.flow;
import java.util.ArrayList; import fi.codecrew.moya.beans.*;
import fi.codecrew.moya.enums.CardState;
import fi.codecrew.moya.enums.apps.TerminalPermission;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.*;
import fi.codecrew.moya.utilities.I18n;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.reader.ReaderNameContainer;
import fi.codecrew.moya.web.cdiview.reader.ReaderView;
import fi.codecrew.moya.web.cdiview.user.UserView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
...@@ -28,23 +39,7 @@ import javax.faces.model.ListDataModel; ...@@ -28,23 +39,7 @@ import javax.faces.model.ListDataModel;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import javax.json.JsonObject; import javax.json.JsonObject;
import java.util.ArrayList;
import fi.codecrew.moya.beans.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.enums.CardState;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.CardCode;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.model.ReaderEvent;
import fi.codecrew.moya.utilities.I18n;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.reader.ReaderNameContainer;
import fi.codecrew.moya.web.cdiview.reader.ReaderView;
import fi.codecrew.moya.web.cdiview.user.UserView;
@Named @Named
@ConversationScoped @ConversationScoped
...@@ -103,7 +98,9 @@ public class IncomingView extends GenericCDIView { ...@@ -103,7 +98,9 @@ public class IncomingView extends GenericCDIView {
private ListDataModel<CardCode> cardCodes; private ListDataModel<CardCode> cardCodes;
public void initView() { public void initView() {
super.beginConversation(); if (super.requirePermissions(TerminalPermission.INFO)) {
super.beginConversation();
}
} }
private ReaderEvent eventToAttach = null; private ReaderEvent eventToAttach = null;
...@@ -117,7 +114,8 @@ public class IncomingView extends GenericCDIView { ...@@ -117,7 +114,8 @@ public class IncomingView extends GenericCDIView {
public void initPrintCardView() { public void initPrintCardView() {
memberlist = null; memberlist = null;
if (!permbean.hasPermission(UserPermission.MODIFY)) {
if (!super.requirePermissions(UserPermission.MODIFY)) {
super.navihandler.redirectNavigation("index.jsf"); super.navihandler.redirectNavigation("index.jsf");
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/InfoView.java
...@@ -18,18 +18,6 @@ ...@@ -18,18 +18,6 @@
*/ */
package fi.codecrew.moya.web.flow; package fi.codecrew.moya.web.flow;
import java.util.List;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.context.FacesContext;
import javax.inject.Inject;
import javax.inject.Named;
import javax.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.UserBeanLocal; import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.ReaderEvent; import fi.codecrew.moya.model.ReaderEvent;
...@@ -38,6 +26,14 @@ import fi.codecrew.moya.utilities.SearchResult; ...@@ -38,6 +26,14 @@ 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.cdiview.reader.ReaderView; import fi.codecrew.moya.web.cdiview.reader.ReaderView;
import fi.codecrew.moya.web.cdiview.user.UserView; import fi.codecrew.moya.web.cdiview.user.UserView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Inject;
import javax.inject.Named;
import java.util.List;
@Named @Named
@ConversationScoped @ConversationScoped
......
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/flowShopView.java
...@@ -18,15 +18,6 @@ ...@@ -18,15 +18,6 @@
*/ */
package fi.codecrew.moya.web.flow; package fi.codecrew.moya.web.flow;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Inject;
import javax.inject.Named;
import org.primefaces.event.SelectEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.PermissionBeanLocal; import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.ReaderEvent; import fi.codecrew.moya.model.ReaderEvent;
...@@ -34,6 +25,14 @@ import fi.codecrew.moya.web.cdiview.GenericCDIView; ...@@ -34,6 +25,14 @@ import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.cdiview.reader.ReaderView; import fi.codecrew.moya.web.cdiview.reader.ReaderView;
import fi.codecrew.moya.web.cdiview.shop.ProductShopView; import fi.codecrew.moya.web.cdiview.shop.ProductShopView;
import fi.codecrew.moya.web.cdiview.user.UserView; import fi.codecrew.moya.web.cdiview.user.UserView;
import org.primefaces.event.SelectEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Inject;
import javax.inject.Named;
@Named @Named
@ConversationScoped @ConversationScoped
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!