map save bug

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/EventMapBean.java

@@ -45,7 +45,8 @@ public class EventMapBean implements EventMapBeanLocal {
 		ret.setName(mapname);
 		ret.setName(mapname);
 		LanEvent event = eventbean.getCurrentEvent();
 		LanEvent event = eventbean.getCurrentEvent();
 		event.getEventMaps().add(ret);
 		event.getEventMaps().add(ret);
-		eventbean.mergeChanges(event);
+		// eventfacade.merge(event);
+		// eventbean.mergeChanges(event);
 		return ret;
 		return ret;
 
 
 	}
 	}

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/poll/PollView.java

@@ -77,7 +77,7 @@ public class PollView extends GenericCDIView {
 		if (super.requirePermissions(PollPermission.ANSWER) && poll == null) {
 		if (super.requirePermissions(PollPermission.ANSWER) && poll == null) {
 			thisPage = 1;
 			thisPage = 1;
 			poll = pollBean.find(pollId);
 			poll = pollBean.find(pollId);
-			if (super.requirePermissions(poll != null))
+			if (super.requirePermissions(poll != null && poll.getQuestions() != null && !poll.getQuestions().isEmpty()))
 			{
 			{
 				return;
 				return;
 			}
 			}
@@ -103,9 +103,7 @@ public class PollView extends GenericCDIView {
 	}
 	}
 
 
 	public List<QuestionWrapper> getCurrentPage() {
 	public List<QuestionWrapper> getCurrentPage() {
-
 		return getPages().get(thisPage);
 		return getPages().get(thisPage);
-
 	}
 	}
 
 
 	public String savePoll() {
 	public String savePoll() {