diff --git a/src/main/java/com/mousetech/gourmetj/AdminMainBean.java b/src/main/java/com/mousetech/gourmetj/AdminMainBean.java index 607095c..f828e1e 100644 --- a/src/main/java/com/mousetech/gourmetj/AdminMainBean.java +++ b/src/main/java/com/mousetech/gourmetj/AdminMainBean.java @@ -120,10 +120,11 @@ public class AdminMainBean implements Serializable { /** * Return to last search, if any + * No longer broken (required Maven include for annotation). */ @PostConstruct void init() { - log.info("Constructing AdminMainBean " + this); + log.debug("Initializing AdminMainBean " + this); this.setSearchText(userSession.getLastSearch()); // Clean up from any previous operations. this.userSession.setRecipe(null); @@ -182,8 +183,9 @@ public class AdminMainBean implements Serializable { */ public String showRecipe() { long recipeId = getSearchResults().getRowData().getId(); - JSFUtils.flashScope().put("recipeID", - Long.valueOf(recipeId)); + // Flash Scope is buggy under Mojarra plus now using session +// JSFUtils.flashScope().put("recipeID", +// Long.valueOf(recipeId)); userSession.setLastEdit(recipeId); userSession.setRecipe(null); // forces loading of line // items. diff --git a/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java b/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java index 769bd9f..3ea29c2 100644 --- a/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java +++ b/src/main/java/com/mousetech/gourmetj/RecipeDetailBean.java @@ -2,11 +2,8 @@ package com.mousetech.gourmetj; import java.io.Serializable; import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Set; @@ -59,7 +56,7 @@ public class RecipeDetailBean implements Serializable { * Default Constructor. */ public RecipeDetailBean() { - log.warn("Constructing RecipeDetail " + this); + log.debug("Constructing RecipeDetail " + this); } /** @@ -228,7 +225,8 @@ public class RecipeDetailBean implements Serializable { */ if (this.recipe == null) { Long rid = - (Long) JSFUtils.getFlash("recipeID"); + //(Long) JSFUtils.getFlash("recipeID"); + userSession.getLastEdit(); if (rid != null) { this.recipe = loadRecipe(rid); } else { @@ -1034,5 +1032,6 @@ public class RecipeDetailBean implements Serializable { iui.setItem(this.getNewGroupName()); List ingUIList = this.getWrappedIngredients(); ingUIList.add(iui); + this.setNewGroupName(""); // Clear for next time! } } diff --git a/src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml b/src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml index b865631..1a63bc7 100644 --- a/src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml +++ b/src/main/resources/META-INF/resources/WEB-INF/layout/layout.xhtml @@ -32,7 +32,7 @@ diff --git a/src/main/resources/META-INF/resources/detailEdit.xhtml b/src/main/resources/META-INF/resources/detailEdit.xhtml index f96d4a4..af80892 100644 --- a/src/main/resources/META-INF/resources/detailEdit.xhtml +++ b/src/main/resources/META-INF/resources/detailEdit.xhtml @@ -28,6 +28,10 @@ width: 20em; text-align: left; } +.groupItem { + font-weight: bold; + background-color: green; +} @@ -277,7 +282,7 @@ /> - + E @@ -293,7 +298,7 @@ - Shopping Cat. + Shopping Category - + - - + />