Merge branch 'master' of dev.insomnia.fi:/data/bortal

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

 package fi.insomnia.bortal.beans;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
@@ -58,6 +59,13 @@ public class VotingBean implements VotingBeanLocal {
     	
     	compoEntryFacade.create(compoEntry);
     	compoEntryFileFacade.create(compoEntryFile);
+    	compoEntry.setCurrentFile(compoEntryFile);
+    	compoEntry.setFiles(new ArrayList<CompoEntryFile>());
+    	compoEntry.getFiles().add(compoEntryFile);
+    }
+    
+    public Compo getCompoById(Integer compoId) {
+    	return compoFacade.find(compoId);
     }
 
     public List<Compo> getCompoList() {

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/VotingBeanLocal.java

@@ -13,4 +13,5 @@ public interface VotingBeanLocal {
 	public void createCompo(Compo c);
 	public void addEntry(CompoEntry compoEntry, CompoEntryFile compoEntryFile);
 	public List<Compo> getCompoList();
+	public Compo getCompoById(Integer compoId);
 }

code/LanBortalWeb/WebContent/voting/addentry.xhtml

@@ -9,7 +9,7 @@
 <h:body>
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
 		<f:metadata>
-			<!-- f:event type="preRenderView" listener="#{newsListView.initView}" /-->
+			<f:viewParam name="compoId" value="#{votingCompoAddEntryView.compoId}"></f:viewParam>
 		</f:metadata>
 		<ui:define name="content">
 			<!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> -->

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/voting/VotingCompoAddEntryView.java

@@ -31,6 +31,8 @@ public class VotingCompoAddEntryView {
 	@NotNull
 	private UploadedFile uploadedFile;
 
+	private Integer compoId;
+	
 	public UploadedFile getUploadedFile() {
 		return uploadedFile;
 	}
@@ -61,7 +63,7 @@ public class VotingCompoAddEntryView {
 		compoEntry.setName(name);
 		compoEntry.setNotes(notes);
 		compoEntry.setScreenMessage(screenMessage);
-		compoEntry.setCompo(null);
+		compoEntry.setCompo(votingBean.getCompoById(compoId));
 		CompoEntryFile cef = new CompoEntryFile(compoEntry);
 		cef.setFileData(this.uploadedFile.getContents());
 		cef.setFileName(uploadedFile.getFileName());