fix: organisation settings were not fetched automatically

Signed-off-by: Oleh Astappiev <[email protected]>
l3s-learnweb · Mar 6, 2024 · 016b8e7 · 016b8e7
1 parent 4c77813
commit 016b8e7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/de/l3s/learnweb/user/OrganisationDao.java b/src/main/java/de/l3s/learnweb/user/OrganisationDao.java
@@ -46,7 +46,7 @@ default List<Organisation> findAll() {
             .registerRowMapper(new OrganisationMapper())
             .mapTo(Organisation.class)
             .map(organisation -> {
-                if (organisation.getSettings() == null) {
+                if (!organisation.getSettings().fetched) {
                     organisation.setSettings(loadSettings(organisation.getId()));
                 }
                 return organisation;
@@ -72,6 +72,7 @@ default OrganisationSettings loadSettings(int organisationId) {
                 } else {
                     settings.setValue(key, value);
                 }
+                settings.fetched = true;
                 return settings;
             });
     }

diff --git a/src/main/java/de/l3s/learnweb/user/OrganisationSettings.java b/src/main/java/de/l3s/learnweb/user/OrganisationSettings.java
@@ -14,6 +14,7 @@ public class OrganisationSettings implements Serializable {
     private static final long serialVersionUID = -22791512601303567L;
     private static final Logger log = LogManager.getLogger(OrganisationSettings.class);
 
+    protected boolean fetched = false;
     private final EnumMap<Settings, Object> settings = new EnumMap<>(Settings.class);
 
     public Set<Map.Entry<Settings, Object>> getValues() {

diff --git a/src/main/webapp/lw/admin/chat-feedback.xhtml b/src/main/webapp/lw/admin/chat-feedback.xhtml
@@ -18,10 +18,11 @@
     <div class="row">
         <div class="col-12 col-md-6">
             <p:panel header="Prompt survey" id="prompt">
-                <p:commandButton action="#{adminChatFeedbackBean.createPromptSurvey}" value="#{msg.create}" update="@parent"
-                                 rendered="#{empty adminChatFeedbackBean.promptSurvey}"/>
+                <h:form rendered="#{empty adminChatFeedbackBean.promptSurvey}">
+                    <p:commandButton action="#{adminChatFeedbackBean.createPromptSurvey}" value="#{msg.create}" update="@form:@parent"/>
+                </h:form>
 
-                <c:if test="#{not empty adminChatFeedbackBean.responseSurvey}">
+                <c:if test="#{not empty adminChatFeedbackBean.promptSurvey}">
                     <ui:decorate template="/WEB-INF/templates/blocks/survey/snippet_page_edit.xhtml">
                         <ui:param name="page" value="#{adminChatFeedbackBean.promptSurvey}"/>
                     </ui:decorate>
@@ -31,8 +32,9 @@
 
         <div class="col-12 col-md-6">
             <p:panel header="Response survey" id="response">
-                <p:commandButton action="#{adminChatFeedbackBean.createResponseSurvey}" value="#{msg.create}" update="@parent"
-                                 rendered="#{empty adminChatFeedbackBean.responseSurvey}"/>
+                <h:form rendered="#{empty adminChatFeedbackBean.responseSurvey}">
+                    <p:commandButton action="#{adminChatFeedbackBean.createResponseSurvey}" value="#{msg.create}" update="@form:@parent"/>
+                </h:form>
 
                 <c:if test="#{not empty adminChatFeedbackBean.responseSurvey}">
                     <ui:decorate template="/WEB-INF/templates/blocks/survey/snippet_page_edit.xhtml">