|
|
@ -20,7 +20,7 @@ import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.primefaces.event.FileUploadEvent; |
|
|
|
import org.primefaces.event.FileUploadEvent; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
|
|
|
|
import org.springframework.orm.jpa.JpaSystemException; |
|
|
|
|
|
|
|
|
|
|
|
import com.mousetech.gourmetj.persistence.model.Category; |
|
|
|
import com.mousetech.gourmetj.persistence.model.Category; |
|
|
|
import com.mousetech.gourmetj.persistence.model.Ingredient; |
|
|
|
import com.mousetech.gourmetj.persistence.model.Ingredient; |
|
|
@ -649,15 +649,24 @@ public class RecipeDetailBean implements Serializable { |
|
|
|
|
|
|
|
|
|
|
|
String ingkey = ing.getIngkey(); |
|
|
|
String ingkey = ing.getIngkey(); |
|
|
|
if (!StringUtils.isEmpty(ingkey)) { |
|
|
|
if (!StringUtils.isEmpty(ingkey)) { |
|
|
|
Shopcat scat = this.recipeService |
|
|
|
try { |
|
|
|
.findShopcatForIngredientKey(ingkey); |
|
|
|
Shopcat scat = this.recipeService |
|
|
|
ing.setShopCat(scat); |
|
|
|
.findShopcatForIngredientKey(ingkey); |
|
|
|
|
|
|
|
ing.setShopCat(scat); |
|
|
|
|
|
|
|
} catch (JpaSystemException ex) { |
|
|
|
|
|
|
|
String msg = String.format( |
|
|
|
|
|
|
|
"Database Error: Unable to fetch info on \"%s\".", |
|
|
|
|
|
|
|
ingkey); |
|
|
|
|
|
|
|
log.error(msg); |
|
|
|
|
|
|
|
JSFUtils.addErrorMessage(msg); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
// get ing list size, set ing position, append
|
|
|
|
// get ing list size, set ing position, append
|
|
|
|
List<IngredientUI> ingredients = getWrappedIngredients(); |
|
|
|
List<IngredientUI> ingredients = getWrappedIngredients(); |
|
|
|
int lsize = ingredients.size(); |
|
|
|
int lsize = ingredients.size(); |
|
|
|
ing.setPosition(lsize + 1); |
|
|
|
ing.setPosition(lsize + 1); |
|
|
|
ingredients.add(new IngredientUI(ing)); |
|
|
|
ingredients.add(new IngredientUI(ing)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// ===
|
|
|
|
// ===
|
|
|
|