fix(reaction): show comment message only if needed

YesWiki · Jan 16, 2023 · aef60ef · aef60ef
1 parent c23dfbe
commit aef60ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/tools/bazar/fields/ReactionsField.php b/tools/bazar/fields/ReactionsField.php
@@ -145,7 +145,8 @@ protected function renderStatic($entry)
             'userReaction' => $userReactions,
             'oldIdsUserReactions' => $oldIdsUserReactions,
             'maxReaction' => self::MAX_REACTIONS,
-            'pageTag' => $currentEntryTag
+            'pageTag' => $currentEntryTag,
+            'showCommentMessage' => !empty($entry['bf_commentaires']) && $entry['bf_commentaires'] == 'oui'
         ]);
     }
 

diff --git a/tools/bazar/presentation/javascripts/form-edit-template.js b/tools/bazar/presentation/javascripts/form-edit-template.js
@@ -642,6 +642,11 @@ var templates = {
             const base = $(element).closest(".acls-field.form-field")
             $(element).addClass("initialized")
 
+            var nameInput = $(base).find("input[type=text][name=name]")
+            if (nameInput.val().trim().length == 0 || 
+              nameInput.val().trim() == 'bf_acls' ){
+              nameInput.val('bf_commentaires')
+            }
 
             var visibleSelect = $(base).find("select[name=askIfActivateComments]")
             var selectedValue = visibleSelect.val()
@@ -650,10 +655,6 @@ var templates = {
               .find(".form-group.fieldLabel-wrap,.form-group.hint-wrap,.form-group.name-wrap,.form-group.value-wrap")
             if ([1,'1'].includes(selectedValue)){
               subElements.show()
-              var nameInput = $(base).find("input[type=text][name=name]")
-              if (nameInput.val().trim().length == 0){
-                nameInput.val('bf_commentaires')
-              }
               var commentInput = $(base).find("select[name=comment]")
               var currentValue = commentInput.val()
               if (Array.isArray(currentValue) &&

diff --git a/tools/bazar/templates/fields/_reactions.twig b/tools/bazar/templates/fields/_reactions.twig
@@ -1,7 +1,7 @@
 {% extends '@core/reactions.twig' %}
 
 {% block extra %}
-  {%- if connected -%}
+  {%- if connected and showCommentMessage -%}
     <em>{{ _t('BAZ_SHARE_YOUR_COMMENT') }}</em>
   {%- endif -%}
 {% endblock extra %}