infokorjailuja permissioihin

code/moya-web/src/main/java/fi/codecrew/moya/web/flow/CardlessIncomingView.java

@@ -20,6 +20,7 @@ package fi.codecrew.moya.web.flow;
 
 
 import fi.codecrew.moya.beans.*;
 import fi.codecrew.moya.beans.*;
 import fi.codecrew.moya.enums.CardState;
 import fi.codecrew.moya.enums.CardState;
+import fi.codecrew.moya.enums.apps.TerminalPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.model.*;
 import fi.codecrew.moya.model.*;
 import fi.codecrew.moya.utilities.I18n;
 import fi.codecrew.moya.utilities.I18n;
@@ -40,6 +41,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 javax.smartcardio.CardPermission;
 import java.security.acl.Group;
 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 {
 
 
 
 
 	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

@@ -23,6 +23,8 @@ import javax.enterprise.context.ConversationScoped;
 import javax.inject.Inject;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Named;
 
 
+import fi.codecrew.moya.enums.apps.ShopPermission;
+import fi.codecrew.moya.model.FoodWave;
 import org.primefaces.event.SelectEvent;
 import org.primefaces.event.SelectEvent;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
@@ -84,13 +86,15 @@ public class FlowFoodwaveView extends GenericCDIView {
 
 
 	
 	
 	public void initFoodsView() {
 	public void initFoodsView() {
-		if(userId == null || userId == 0) {
-			userView.setUserid(null);
-		} else {
-			userView.setUserid(userId);
+		if(super.requirePermissions(ShopPermission.MANAGE_FOODWAVES)) {
+			if (userId == null || userId == 0) {
+				userView.setUserid(null);
+			} else {
+				userView.setUserid(userId);
+			}
+
+			foodWaveFoodView.initFoodWaveFoods();
 		}
 		}
-		
-		foodWaveFoodView.initFoodWaveFoods();
 	}
 	}
 	
 	
 	
 	

code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingView.java

@@ -30,6 +30,7 @@ import javax.inject.Named;
 import javax.json.JsonObject;
 import javax.json.JsonObject;
 
 
 import fi.codecrew.moya.beans.*;
 import fi.codecrew.moya.beans.*;
+import fi.codecrew.moya.enums.apps.TerminalPermission;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
@@ -103,7 +104,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 +120,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");
 		}
 		}