Merge branch 'ticketPermissionCheck' into 'master'

Ticket permission check

permissiochecki elippuun.

See merge request !298

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/eticket/EticketView.java

@@ -19,12 +19,10 @@
 package fi.codecrew.moya.web.cdiview.eticket;
 package fi.codecrew.moya.web.cdiview.eticket;
 
 
 import fi.codecrew.moya.beans.*;
 import fi.codecrew.moya.beans.*;
-import fi.codecrew.moya.enums.apps.MapPermission;
-import fi.codecrew.moya.model.EventUser;
+import fi.codecrew.moya.enums.apps.BillPermission;
 import fi.codecrew.moya.model.GroupMembership;
 import fi.codecrew.moya.model.GroupMembership;
 import fi.codecrew.moya.model.Place;
 import fi.codecrew.moya.model.Place;
 import fi.codecrew.moya.model.PlaceGroup;
 import fi.codecrew.moya.model.PlaceGroup;
-import fi.codecrew.moya.web.annotations.SelectedUser;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import fi.codecrew.moya.web.cdiview.shop.InviteView;
 import fi.codecrew.moya.web.cdiview.shop.InviteView;
 import fi.codecrew.moya.web.cdiview.user.UserView;
 import fi.codecrew.moya.web.cdiview.user.UserView;
@@ -38,7 +36,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 java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -92,11 +89,15 @@ public class EticketView extends GenericCDIView {
 
 
 
 
 	public void initView() {
 	public void initView() {
+
+		if(requirePermissions(BillPermission.VIEW_OWN)) {
+
 			List<GroupMembership> gmlist = ticketBean.findMembershipPrintlistForUser(userView.getSelectedUser());
 			List<GroupMembership> gmlist = ticketBean.findMembershipPrintlistForUser(userView.getSelectedUser());
 
 
-		if(gmlist == null || gmlist.size() <= 0)
+			if (gmlist == null || gmlist.size() <= 0)
 				super.navihandler.forward("/shop/createBill?faces-redirect=true");
 				super.navihandler.forward("/shop/createBill?faces-redirect=true");
 		}
 		}
+	}
 	
 	
 	public ListDataModel<GroupMembership> getGroupMemberships() {
 	public ListDataModel<GroupMembership> getGroupMemberships() {
 		memberlist = new ListDataModel<GroupMembership>(ticketBean.findMembershipPrintlistForUser(userView.getSelectedUser()));
 		memberlist = new ListDataModel<GroupMembership>(ticketBean.findMembershipPrintlistForUser(userView.getSelectedUser()));