diff --git a/pom.xml b/pom.xml
index 0aca58b..5e24112 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,10 @@
javax.enterprise
cdi-api
+
+ org.springframework.boot
+ spring-boot-starter-security
+
org.springframework.boot
spring-boot-starter-data-jpa
@@ -120,6 +124,11 @@
${junit.jupiter.version}
test
+
+ org.springframework.security
+ spring-security-test
+ test
+
diff --git a/src/main/java/com/mousetech/gourmetj/AdminMainBean.java b/src/main/java/com/mousetech/gourmetj/AdminMainBean.java
index 31a6311..317e144 100644
--- a/src/main/java/com/mousetech/gourmetj/AdminMainBean.java
+++ b/src/main/java/com/mousetech/gourmetj/AdminMainBean.java
@@ -223,7 +223,7 @@ public class AdminMainBean implements Serializable {
* maint.)
*/
public String doMore() {
- return "shoppingList.jsf";
+ return "shoppingList.jsf?redirect=true";
}
/**
diff --git a/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java b/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java
index 5f95e1c..5479071 100644
--- a/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java
+++ b/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java
@@ -649,6 +649,13 @@ public class RecipeDetailBean implements Serializable {
log.info("Ingredient line: \"" + ingredientText + "\"");
Ingredient ing =
IngredientDigester.digest(ingredientText);
+
+ String ingkey = ing.getIngkey();
+ if (!StringUtils.isEmpty(ingkey)) {
+ Shopcat scat = this.recipeService
+ .findShopcatForIngredientKey(ingkey);
+ ing.setShopCat(scat);
+ }
// get ing list size, set ing position, append
List ingredients = getWrappedIngredients();
int lsize = ingredients.size();
@@ -970,25 +977,26 @@ public class RecipeDetailBean implements Serializable {
}
// ***
+ // Editor pages are secured (redirect=true)
public String editDescription() {
this.setDetailTab(0);
- return "detailEdit";
+ return "detailEdit?faces-redirect=true";
}
public String editIngredients() {
this.setDetailTab(1);
- return "detailEdit";
+ return "detailEdit?faces-redirect=true";
}
public String editInstructions() {
this.setDetailTab(2);
- return "detailEdit";
+ return "detailEdit?faces-redirect=true";
}
public String editNotes() {
this.setDetailTab(3);
- return "detailEdit";
+ return "detailEdit?faces-redirect=true";
}
private void setDetailTab(int i) {
diff --git a/src/main/resources/META-INF/resources/detailEdit.xhtml b/src/main/resources/META-INF/resources/detailEdit.xhtml
index eded5d3..a0af464 100644
--- a/src/main/resources/META-INF/resources/detailEdit.xhtml
+++ b/src/main/resources/META-INF/resources/detailEdit.xhtml
@@ -308,6 +308,7 @@
id="eShopcat"
value="E"
action="#{recipeDetailBean.ajaxEditShopcat(item)}"
+ immediate="true"
update="editShopcatDlg"
oncomplete="PF('editShopcatDlg').show()"
title="Edit the shopping category for ing. key"