From f3c28258d1cafd62eaa269ed97e47a56e2fb50f3 Mon Sep 17 00:00:00 2001
From: Tim Holloway <timh@mousetech.com>
Date: Mon, 17 Jan 2022 16:24:12 -0500
Subject: [PATCH] Fixed shopcat setting on detail edit/new recipe

---
 pom.xml                                          |  9 +++++++++
 .../com/mousetech/gourmetj/AdminMainBean.java    |  2 +-
 .../com/mousetech/gourmetj/RecipeDetailBean.java | 16 ++++++++++++----
 .../META-INF/resources/detailEdit.xhtml          |  1 +
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0aca58b..5e24112 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,10 @@
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -120,6 +124,11 @@
             <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
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<IngredientUI> 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"