foodwavesta luotu producti on piilotettu infon kaupasta. Käyttäjämuokkauksessa '…

…Roolit' -> 'Pakotetut roolit'

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

@@ -33,6 +33,7 @@ import fi.codecrew.moya.facade.ProductFacade;
 import fi.codecrew.moya.model.FoodWave;
 import fi.codecrew.moya.model.FoodWave;
 import fi.codecrew.moya.model.FoodWaveTemplate;
 import fi.codecrew.moya.model.FoodWaveTemplate;
 import fi.codecrew.moya.model.Product;
 import fi.codecrew.moya.model.Product;
+import fi.codecrew.moya.model.ProductFlag;
 
 
 /**
 /**
  * Session Bean implementation class FoodWaveBean
  * Session Bean implementation class FoodWaveBean
@@ -117,6 +118,7 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
 		template = fwtFacade.reload(template);
 		template = fwtFacade.reload(template);
 		if (product.getId() == null)
 		if (product.getId() == null)
 		{
 		{
+			product.addProductFlag(ProductFlag.HIDE_FROM_INFOSHOP);
 			productfacade.create(product);
 			productfacade.create(product);
 		} else {
 		} else {
 			product = productfacade.reload(product);
 			product = productfacade.reload(product);

code/moya-database/src/main/java/fi/codecrew/moya/model/Product.java

@@ -22,26 +22,13 @@
  */
  */
 package fi.codecrew.moya.model;
 package fi.codecrew.moya.model;
 
 
+
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.HashSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.List;
 import java.util.Set;
 import java.util.Set;
 
 
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.Lob;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
+import javax.persistence.*;
 
 
 import org.eclipse.persistence.annotations.PrivateOwned;
 import org.eclipse.persistence.annotations.PrivateOwned;
 
 
@@ -320,6 +307,20 @@ public class Product extends GenericEntity {
         this.productFlags = productFlags;
         this.productFlags = productFlags;
     }
     }
 
 
+    @Transient
+    public void addProductFlag(ProductFlag flag) {
+
+        Set<ProductFlag> flags = getProductFlags();
+
+        if(flags == null)
+            flags = new HashSet<ProductFlag>();
+
+        if(!flags.contains(flag)) {
+            flags.add(flag);
+            setProductFlags(flags);
+        }
+    }
+
     public List<ProductLimitation> getProductLimits() {
     public List<ProductLimitation> getProductLimits() {
         return productLimits;
         return productLimits;
     }
     }

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

@@ -487,3 +487,4 @@ barcodeReader.readBarcode=Lue viivakoodi
 incomingflow.allGiven=Merkitty {0} lippu(a) annetuksi.
 incomingflow.allGiven=Merkitty {0} lippu(a) annetuksi.
 reader.noReader=Ei valittua lukijaa
 reader.noReader=Ei valittua lukijaa
 etickets.mailSended=Lippu l\u00E4hetetty s\u00E4hk\u00F6postiisi
 etickets.mailSended=Lippu l\u00E4hetetty s\u00E4hk\u00F6postiisi
+user.roles=Pakotetut roolit

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

@@ -1564,7 +1564,7 @@ user.passwordlengthMessage = Password is too short!
 user.phone          = Tel
 user.phone          = Tel
 user.profile        = Profile
 user.profile        = Profile
 user.realname       = Name
 user.realname       = Name
-user.roles          = Roles
+user.roles          = Forced roles
 user.rolesave       = Save roles
 user.rolesave       = Save roles
 user.save           = Save
 user.save           = Save
 user.saveFailed     = Save failed, Not enough permissions!
 user.saveFailed     = Save failed, Not enough permissions!

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

@@ -1549,7 +1549,7 @@ user.phone          = Puhelin
 user.placegroups    = Omat paikkaryhm\u00E4t
 user.placegroups    = Omat paikkaryhm\u00E4t
 user.profile        = Profiili
 user.profile        = Profiili
 user.realname       = Nimi
 user.realname       = Nimi
-user.roles          = Roolit
+user.roles          = Pakotetut roolit
 user.rolesave       = Tallenna roolit
 user.rolesave       = Tallenna roolit
 user.save           = Tallenna
 user.save           = Tallenna
 user.saveRoles      = Tallenna roolit
 user.saveRoles      = Tallenna roolit