diff --git a/pom.xml b/pom.xml index 2971466..425cfe7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.mousetech.gourmet gourmetj - 0.2.5 + 0.2.6 jar GourmetJ @@ -84,10 +84,6 @@ gson runtime - org.springframework.boot spring-boot-starter-security @@ -96,14 +92,6 @@ org.springframework.boot spring-boot-starter-data-jpa - - - jakarta.validation jakarta.validation-api @@ -129,21 +117,11 @@ provided - org.apache.tomcat.embed tomcat-embed-jasper provided - @@ -158,7 +136,6 @@ - com.twelvemonkeys.imageio imageio-webp @@ -166,7 +143,6 @@ compile com.twelvemonkeys.servlet @@ -184,12 +160,6 @@ 8.0.30 - - org.junit.jupiter junit-jupiter diff --git a/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java b/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java index a25d0da..dcb8e60 100644 --- a/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java +++ b/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java @@ -721,7 +721,7 @@ public class RecipeDetailBean implements Serializable { if (recipeService.save(this.getRecipe())) { userSession.setRecipe(null); - return "recipeDetails"; + return "recipeDetails?faces-redirect=true"; } else { JSFUtils.addErrorMessage("Save recipe failed"); return null; diff --git a/src/main/java/com/mousetech/gourmetj/SpringSecurityConfig.java b/src/main/java/com/mousetech/gourmetj/SpringSecurityConfig.java index 5386fdc..aeafc17 100644 --- a/src/main/java/com/mousetech/gourmetj/SpringSecurityConfig.java +++ b/src/main/java/com/mousetech/gourmetj/SpringSecurityConfig.java @@ -136,6 +136,6 @@ public class SpringSecurityConfig { "/recipeDetails.jsf", "/recipeDetails.xhtml", "/shoppingList.jsf", - "/recipePrint.jsf"); + "/recipePrint.xhtml"); } } diff --git a/src/main/resources/META-INF/resources/detailEdit.xhtml b/src/main/resources/META-INF/resources/detailEdit.xhtml index 21ad90e..c6f6f78 100644 --- a/src/main/resources/META-INF/resources/detailEdit.xhtml +++ b/src/main/resources/META-INF/resources/detailEdit.xhtml @@ -62,12 +62,12 @@ - + @@ -372,28 +372,34 @@ >
- + > + +
- + > + + - + diff --git a/src/main/resources/META-INF/resources/recipePrint.xhtml b/src/main/resources/META-INF/resources/recipePrint.xhtml index d9e530a..a54be21 100644 --- a/src/main/resources/META-INF/resources/recipePrint.xhtml +++ b/src/main/resources/META-INF/resources/recipePrint.xhtml @@ -50,7 +50,7 @@ /> - + - + + \ No newline at end of file diff --git a/src/main/resources/META-INF/resources/shoppingList.xhtml b/src/main/resources/META-INF/resources/shoppingList.xhtml index 0531ea6..3e578a5 100644 --- a/src/main/resources/META-INF/resources/shoppingList.xhtml +++ b/src/main/resources/META-INF/resources/shoppingList.xhtml @@ -42,7 +42,7 @@ @@ -87,7 +87,7 @@ >