(#21): domain model fixes

univie-nutrition · Mar 10, 2024 · ab25759 · ab25759
1 parent 66c258a
commit ab25759
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...a/globodiet/manager/editing/other/FacetDescriptorPathwayForFoodGroupManager_addEntry.java b/...a/globodiet/manager/editing/other/FacetDescriptorPathwayForFoodGroupManager_addEntry.java
@@ -116,11 +116,11 @@ public FacetDescriptorPathwayForFoodGroup act(
                     && Objects.equals(fg.getFoodSubgroupCode(), p.foodSubgroup().getFoodSubgroupCode()));
     }
 
-    @MemberSupport public List<FoodFacet> choicesFacet(
+    @MemberSupport public List<FoodFacet> choicesFoodFacet(
             final FacetDescriptorPathwayForFoodGroup.Params p) {
         return repositoryService.allInstances(FoodFacet.class);
     }
-    @MemberSupport public List<FoodDescriptor> choicesDescriptor(
+    @MemberSupport public List<FoodDescriptor> choicesFoodDescriptor(
             final FacetDescriptorPathwayForFoodGroup.Params p) {
         return p.foodFacet()!=null
                 ? repositoryService.allMatches(FoodDescriptor.class,

diff --git a/globodiet/params/src/main/java/dita/globodiet/dom/params/recipe_list/Recipe.layout.xml b/globodiet/params/src/main/java/dita/globodiet/dom/params/recipe_list/Recipe.layout.xml
@@ -58,7 +58,7 @@
                 <bs:tab name="Facet/Descriptor">
                     <bs:row>
                         <bs:col span="12">
-                            <cpt:collection id="effectiveFoodDescriptors"></cpt:collection>
+                            <cpt:collection id="effectiveRecipeDescriptors"></cpt:collection>
                             <cpt:collection id="dependentFacetDescriptorPathwayForRecipeMappedByRecipe"></cpt:collection>
                         </bs:col>
                     </bs:row>