Merge branch 'feature/vectorama2015-changes' into 'master'

Feature/vectorama2015 changes

See merge request !289

code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/VipBeanLocal.java

@@ -20,6 +20,8 @@ public interface VipBeanLocal {
 
 	void create(Vip vip);
 
+	void delete(Vip vip);
+
 	Vip find(Integer id);
 
 	Vip createProduct(VipProduct l);

code/moya-beans/ejbModule/fi/codecrew/moya/beans/VipBean.java

@@ -57,6 +57,7 @@ public class VipBean implements VipBeanLocal {
 	}
 
 	@Override
+	@RolesAllowed({ VipPermission.S_EDIT })
 	public void create(Vip vip) {
 		vip.setCreated(new Date());
 		vip.setCreator(permbean.getCurrentUser());
@@ -69,6 +70,14 @@ public class VipBean implements VipBeanLocal {
 	}
 
 	@Override
+	@RolesAllowed({ VipPermission.S_EDIT })
+	public void delete(Vip vip) {
+		vip = vipFacade.merge(vip);
+		vipFacade.remove(vip);
+	}
+
+	@Override
+	@RolesAllowed({ VipPermission.S_VIEW })
 	public Vip find(Integer id) {
 		return vipFacade.find(id);
 	}
@@ -80,6 +89,7 @@ public class VipBean implements VipBeanLocal {
 	//	}
 
 	@Override
+	@RolesAllowed({ VipPermission.S_EDIT })
 	public Vip createProduct(VipProduct l) {
 		Vip vip = vipFacade.reload(l.getVip());
 		l.setVip(vip);
@@ -92,23 +102,27 @@ public class VipBean implements VipBeanLocal {
 	}
 
 	@Override
+	@RolesAllowed({ VipPermission.S_VIEW })
 	public SearchResult<Vip> search(SearchQuery sq) {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
+	@RolesAllowed({ VipPermission.S_EDIT })
 	public Vip save(Vip vip) {
 		return vipFacade.merge(vip);
 	}
 
 	@Override
+	@RolesAllowed({ VipPermission.S_EDIT })
 	public Vip saveProduct(VipProduct prod) {
 		VipProduct ret = vipProductFacade.merge(prod);
 		return ret.getVip();
 	}
 
 	@Override
+	@RolesAllowed({ VipPermission.S_EDIT })
 	public Vip deleteProduct(VipProduct l) {
 		l = vipProductFacade.reload(l);
 		Vip vip = l.getVip();
@@ -118,6 +132,7 @@ public class VipBean implements VipBeanLocal {
 	}
 
 	@Override
+	@RolesAllowed({ VipPermission.S_USAGE })
 	public VipProductDelivery createDelivery(VipProduct prod, BigDecimal quantity, String notes) {
 		prod = vipProductFacade.reload(prod);
 

code/moya-web/WebContent/vip/viplist.xhtml

@@ -16,7 +16,7 @@
 			<br />
 
 			<h:form id="vipform">
-				<p:dataTable id="vip" value="#{vipListView.viplist}" widgetVar="viplist" styleClass="moya_datatable4" var="vip" filteredValue="#{vipListView.filteredVips}">
+				<p:dataTable id="vipList" value="#{vipListView.viplist}" widgetVar="viplist" styleClass="moya_datatable4" var="vip" filteredValue="#{vipListView.filteredVips}">
 					<!-- f:facet name="header">
 						<p:outputPanel>
 							<h:outputText value="Search all fields:" />
@@ -61,14 +61,19 @@
 
 					<p:column style="width: 90px; text-align: center;">
 						<p:commandButton id="delivebtn" rendered="#{not empty vip.id}" value="#{i18n['vip.deliver']}" actionListener="#{vipListView.deliverDialog}" >
-							<p:ajax event="dialogReturn" listener="#{vipListView.updateViplist()}" update="vip" />
+							<p:ajax event="dialogReturn" listener="#{vipListView.updateViplist()}" update="vipList" />
 						</p:commandButton>
 					</p:column>
-					<p:column  style="width: 90px;">
+					<p:column  style="width: 70px;">
 						<h:link outcome="/vip/edit" value="#{i18n['vip.edit']}" >
 							<f:param name="id" value="#{vip.id}" />
 						</h:link>
 					</p:column>
+					<p:column  style="width: 70px;">
+						<p:commandLink actionListener="#{vipListView.deleteEntry(vip)}" update="vipList">
+							<h:outputText value="#{i18n['vip.delete']}"/>
+						</p:commandLink>
+					</p:column>
 				</p:dataTable>
 			</h:form>
 		</ui:define>

code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/UserRestViewV2.java

@@ -172,7 +172,20 @@ public class UserRestViewV2 {
             User user = userBean.getUser(userId);
             UserImage image = user.getCurrentImage();
             //logger.info("Mimetype: " + body.getMediaType());
-            return Response.ok(image.getImageData(), image.getMimeType()).build();
+
+            // XXX: Vectorama2015 - assume image/jpeg if mime type not known
+            String mimeType = image.getMimeType();
+            if (mimeType != null) {
+                if (!mimeType.equals("image/png") && !mimeType.equals("image/gif")) {
+                    // fallback
+                    mimeType = "image/jpeg";
+                }
+            } else {
+                // fallback if null
+                mimeType = "image/jpeg";
+            }
+
+            return Response.ok(image.getImageData(), mimeType).build();
         } catch(Exception e) {
             logger.error("Getting image failed", e);
             return Response.serverError().entity(PojoUtils.initErrorPojo(e.getMessage())).build();

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/vip/VipListView.java

@@ -71,6 +71,12 @@ public class VipListView extends PaginationView<Vip> {
 		RequestContext.getCurrentInstance().openDialog("/vip/deliver", options, params);
 	}
 
+	public void deleteEntry(Vip item) {
+		vipBean.delete(item);
+		viplist = null;
+		initView();
+	}
+
 	public ListDataModel<Vip> getViplist() {
 		return viplist;
 	}

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties

@@ -536,3 +536,4 @@ vipProduct.name   = Tuote
 vipProduct.quantity = Lukum\u00E4\u00E4r\u00E4
 
 yes = Kyll\u00E4
+vip.delete=Poista

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties

@@ -1778,3 +1778,4 @@ voting.create.voteEnd       = Voting close
 voting.create.voteStart     = Voting start
 
 yes = Yes
+vip.delete=Delete

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties

@@ -1761,3 +1761,4 @@ voting.create.voteEnd       = \u00C4\u00E4nestys kiinni
 voting.create.voteStart     = \u00C4\u00E4nestys auki
 
 yes = Kyll\u00E4
+vip.delete=Poista