Commit 3139ac65 by Tuomas Riihimäki

Merge branch 'ticketPermissionCheck' into 'master'

Ticket permission check

permissiochecki elippuun.

See merge request !298
2 parents e44109c3 175124d9
......@@ -19,12 +19,10 @@
package fi.codecrew.moya.web.cdiview.eticket;
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.Place;
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.shop.InviteView;
import fi.codecrew.moya.web.cdiview.user.UserView;
......@@ -38,7 +36,6 @@ import javax.faces.context.FacesContext;
import javax.faces.model.ListDataModel;
import javax.inject.Inject;
import javax.inject.Named;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -92,10 +89,14 @@ public class EticketView extends GenericCDIView {
public void initView() {
List<GroupMembership> gmlist = ticketBean.findMembershipPrintlistForUser(userView.getSelectedUser());
if(gmlist == null || gmlist.size() <= 0)
super.navihandler.forward("/shop/createBill?faces-redirect=true");
if(requirePermissions(BillPermission.VIEW_OWN)) {
List<GroupMembership> gmlist = ticketBean.findMembershipPrintlistForUser(userView.getSelectedUser());
if (gmlist == null || gmlist.size() <= 0)
super.navihandler.forward("/shop/createBill?faces-redirect=true");
}
}
public ListDataModel<GroupMembership> getGroupMemberships() {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!