Skip to content

Linnea Samila / Moya

Go to a project
Commit dc1b0140 by Tuukka Kivilahti
Options

asdf

1 parent 977c4753
Inline Side-by-side
Showing with 8 additions and 9 deletions
code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingPlaceshopView.java
...@@ -6,6 +6,7 @@ import fi.codecrew.moya.beans.PlaceBeanLocal; ...@@ -6,6 +6,7 @@ import fi.codecrew.moya.beans.PlaceBeanLocal;
import fi.codecrew.moya.beans.map.QueueBeanLocal; import fi.codecrew.moya.beans.map.QueueBeanLocal;
import fi.codecrew.moya.beans.map.QueueBeanLocal.MapQueueI; import fi.codecrew.moya.beans.map.QueueBeanLocal.MapQueueI;
import fi.codecrew.moya.enums.apps.MapPermission; import fi.codecrew.moya.enums.apps.MapPermission;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.exceptions.BortalCatchableException; import fi.codecrew.moya.exceptions.BortalCatchableException;
import fi.codecrew.moya.model.*; import fi.codecrew.moya.model.*;
import fi.codecrew.moya.model.map.MapReservationQueueEntry; import fi.codecrew.moya.model.map.MapReservationQueueEntry;
...@@ -60,18 +61,16 @@ public class IncomingPlaceshopView extends GenericCDIView { ...@@ -60,18 +61,16 @@ public class IncomingPlaceshopView extends GenericCDIView {
public void initView() { public void initView() {
beginConversation(); if (super.requirePermissions(MapPermission.MANAGE_OTHERS)) {
beginConversation();
if(userId == null || userId == 0) { if(userId == null || userId == 0) {
userview.setUserid(permbean.getAnonEventUser().getUser().getId()); userview.setUserid(permbean.getAnonEventUser().getUser().getId());
} else { } else {
userview.setUserid(userId); userview.setUserid(userId);
}
} }
// TODO: permissionCheck
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!