Commit 5ce78779 by Juho Juopperi

imports

1 parent 188fc699
......@@ -9,8 +9,6 @@ import javax.faces.model.ListDataModel;
import javax.inject.Inject;
import javax.inject.Named;
import org.eclipse.persistence.internal.sessions.DirectCollectionChangeRecord.NULL;
import fi.insomnia.bortal.beans.PlaceGroupBeanLocal;
import fi.insomnia.bortal.enums.apps.MapPermission;
import fi.insomnia.bortal.model.EventUser;
......@@ -52,18 +50,18 @@ public class PlacegroupView extends GenericCDIView {
public boolean canModify(GroupMembership row) {
boolean ret = false;
if (row != null && (
permbean.isCurrentUser(row.getPlaceGroup().getCreator()) ||
permbean.hasPermission(MapPermission.MANAGE_OTHERS))) {
if (row != null
&& (permbean.isCurrentUser(row.getPlaceGroup().getCreator()) || permbean
.hasPermission(MapPermission.MANAGE_OTHERS))) {
ret = true;
}
return ret;
}
public boolean isCanModifyCurrent() {
return canModify(memberlist.getRowData());
}
public boolean isCurrentMemberUserNotNull() {
GroupMembership row = memberlist.getRowData();
if (row != null && row.getUser() != null)
......@@ -72,20 +70,22 @@ public class PlacegroupView extends GenericCDIView {
}
public ListDataModel<GroupMembership> getGroupMemberships() {
memberlist = new ListDataModel<GroupMembership>(placegroupBean.getMembershipsAndCreations(user));
memberlist = new ListDataModel<GroupMembership>(
placegroupBean.getMembershipsAndCreations(user));
return memberlist;
}
public String releasePlace() {
GroupMembership row = memberlist.getRowData();
if (row != null)
{
if (permbean.isCurrentUser(row.getPlaceGroup().getCreator()) ||
permbean.hasPermission(MapPermission.MANAGE_OTHERS)) {
if (row != null) {
if (permbean.isCurrentUser(row.getPlaceGroup().getCreator())
|| permbean.hasPermission(MapPermission.MANAGE_OTHERS)) {
placegroupBean.releaseAndGenerateToken(row);
this.addFaceMessage("placegroupview.placeReleased", row.getPlaceReservation().getName());
this.addFaceMessage("placegroupview.placeReleased", row
.getPlaceReservation().getName());
} else {
this.addFaceMessage("placegroupview.placeReleaseFailed", row.getPlaceReservation().getName());
this.addFaceMessage("placegroupview.placeReleaseFailed", row
.getPlaceReservation().getName());
}
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!