Commit 20ceaf74 by Tuomas Riihimäki

Minoreita

1 parent 269b0dc2
......@@ -3,6 +3,7 @@ package fi.codecrew.moya.web;
import java.io.PrintWriter;
import java.io.Serializable;
import java.io.StringWriter;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Map;
import java.util.zip.CRC32;
......@@ -58,7 +59,7 @@ public class ErrorPageView implements Serializable {
Throwable ex =
(Throwable) requestMap.get("javax.servlet.error.exception");
CRC32 stackHash = new CRC32();
stackHash.update(ex.getStackTrace().toString().getBytes());
stackHash.update(Arrays.toString(ex.getStackTrace()).getBytes());
return "0x" + Long.toHexString(stackHash.getValue());
......
package fi.codecrew.moya.web.flow;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import javax.ejb.EJB;
......@@ -21,11 +20,9 @@ import fi.codecrew.moya.beans.PlaceBeanLocal;
import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.enums.CardState;
import fi.codecrew.moya.enums.apps.MapPermission;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.GroupMembership;
import fi.codecrew.moya.model.PlaceGroup;
import fi.codecrew.moya.model.PrintedCard;
import fi.codecrew.moya.util.UserSearchQuery;
import fi.codecrew.moya.utilities.SearchResult;
......@@ -69,7 +66,7 @@ public class IncomingView extends GenericCDIView {
@EJB
private UserBeanLocal userbean;
@EJB
private transient PlaceGroupBeanLocal placegroupBean;
......@@ -77,9 +74,8 @@ public class IncomingView extends GenericCDIView {
private EventUser searchMulti = null;
ListDataModel<GroupMembership> memberlist = null;
private ListDataModel<GroupMembership> memberlist = null;
public void initView() {
super.beginConversation();
}
......@@ -228,16 +224,12 @@ public class IncomingView extends GenericCDIView {
public void setSearchMulti(EventUser searchMulti) {
this.searchMulti = searchMulti;
}
public ListDataModel<GroupMembership> getGroupMemberships() {
memberlist = new ListDataModel<GroupMembership>(
placegroupBean.getMembershipsAndCreations(user));
return memberlist;
}
public String givePlace() {
GroupMembership row = memberlist.getRowData();
......@@ -247,7 +239,7 @@ public class IncomingView extends GenericCDIView {
}
return null;
}
public String ungivePlace() {
GroupMembership row = memberlist.getRowData();
if (row != null) {
......@@ -257,8 +249,4 @@ public class IncomingView extends GenericCDIView {
return null;
}
}
package fi.codecrew.moya.web.helper;
import java.io.ByteArrayInputStream;
import java.io.Serializable;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
......@@ -31,8 +32,12 @@ import fi.codecrew.moya.model.MenuNavigation;
@Named
@RequestScoped
public class LayoutView {
public class LayoutView implements Serializable {
/**
*
*/
private static final long serialVersionUID = 4468645109141859301L;
@Inject
private FacesContext context;
private ResourceBundle rb;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!