Correct Display and Funcionality of Text/Sentences Buttons

thesaurus-linguae-aegyptiae · Sep 13, 2023 · a6e4dec · a6e4dec
1 parent fbff462
commit a6e4dec
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/src/main/java/tla/web/config/ObjectDetailsProperties.java b/src/main/java/tla/web/config/ObjectDetailsProperties.java
@@ -27,5 +27,5 @@ public class ObjectDetailsProperties {
    private Map<String, List<String>> hideable1LemmaProperties;
    private Map<String, List<String>> showableProperties;
    private Map<String, List<String>> hideable2LemmaProperties;
-   private Map<String, List<String>> hideablesTextsentencesProperties;
+   private Map<String, List<String>> hideableTextsentencesProperties;
 }
diff --git a/src/main/java/tla/web/config/SearchProperties.java b/src/main/java/tla/web/config/SearchProperties.java
@@ -30,7 +30,7 @@ public abstract class SearchProperties {
    private Map<String, List<String>> hideable1LemmaProperties;
    private Map<String, List<String>> showableProperties;
    private Map<String, List<String>> hideable2LemmaProperties;
-   private Map<String, List<String>> hideablesTextsentencesProperties;
+   private Map<String, List<String>> hideableTextsentencesProperties;
     /**
      * Sort orders to be made available on search results page
      */

diff --git a/src/main/java/tla/web/mvc/ObjectController.java b/src/main/java/tla/web/mvc/ObjectController.java
@@ -375,7 +375,7 @@ protected Model addHideablesTextsentencesProperties(Model model) {
         if (searchProperties != null) {
             model.addAttribute(
                 "hideablesTextsentencesProperties",
-                searchProperties.getHideablesTextsentencesProperties()
+                searchProperties.getHideableTextsentencesProperties()
             );
 
         }

diff --git a/src/main/java/tla/web/mvc/TextObjectController.java b/src/main/java/tla/web/mvc/TextObjectController.java
@@ -90,12 +90,16 @@ public String getTextSentencesSearchResultsPage(
                     )
                 )
             );
+            var searchProperties = sentenceService.getSearchProperties();
+            if (searchProperties != null) {
+                model.addAttribute(
+                    "hideableTextsentencesProperties",
+                    searchProperties.getHideableTextsentencesProperties()
+                );
+
+            }
             // DW: die folgenden werden durch ObjectController ererbet? Hier nochmal nötig?
-            this.addHideableProperties(model);
-            this.addHideablesTextsentencesProperties(model);
-           this.addShowableProperties(model);
-            this.addHideable1LemmaProperties(model);
-            this.addHideable2LemmaProperties(model);
+
             model.addAttribute("objectType", "sentence");
             model.addAttribute("searchResults", results.getObjects());
             if(results.getQuery().getSort()==null ) results.getQuery().setSort("sortKey_asc");   

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -187,7 +187,7 @@ search:
             dating: []
             texteditor: []
 
-        hideables-textsentences-properties:
+        hideable-textsentences-properties:
             hieroglyphs: []
             switchannotation: 
                 - wordclass

diff --git a/src/main/resources/templates/fragments/search/results.html b/src/main/resources/templates/fragments/search/results.html
@@ -425,10 +425,8 @@ <h2 class="result-list-item-element label bbaw-libertine" th:utext="${{'<shortla
 
       <div th:fragment="hideTextsentences-properties-buttons" class="hideTextsentences-properties-buttons">
       <!-- <input type="num_text" id="result" /> -->
-     <span> Hier Buttons</span>
 
-      <th:block th:each="e : ${hideablesTextsentencesProperties}" th:with="property=${e.key}">
-          <span> B</span>
+      <th:block th:each="e : ${hideableTextsentencesProperties}" th:with="property=${e.key}">
           <div th:replace=" :: hideTextsentences-property-button(${property}, null)"/>
           <th:block th:with="subProperties=${e.value}">
             <div th:unless="${#lists.isEmpty(subProperties)}"