Merge pull request #2661 from justcarakas/2627-faq-allow-feedback

faq allow feedback
forkcms · Oct 16, 2018 · 519525c · 519525c
2 parents cc94b65 + 57f2786
commit 519525c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/Frontend/Modules/Faq/Actions/Detail.php b/src/Frontend/Modules/Faq/Actions/Detail.php
@@ -180,7 +180,7 @@ private function isFeedbackNoInfoHidden(): bool
             return (bool) $this->feedbackForm->getField('useful')->getValue();
         }
 
-        return false;
+        return true;
     }
 
     private function increaseViewCount(): void

diff --git a/src/Frontend/Modules/Faq/Js/Faq.js b/src/Frontend/Modules/Faq/Js/Faq.js
@@ -13,17 +13,18 @@ jsFrontend.faq.feedback = {
     $('input[data-role=fork-feedback-useful]').on('change', function () {
       var $wrapperForm = $(this.form)
 
-      // init useful status
-      var useful = $('input[data-role=fork-feedback-useful]:checked').val()
+      var useful = parseInt($('input[data-role=fork-feedback-useful]:checked').val())
 
-      // show or hide the form
-      if (useful) {
+      // submit when it is useful, ask for feedback otherwise
+      if (useful === 1) {
         $wrapperForm.find('textarea[data-role=fork-feedback-improve-message]').prop('required', false)
         $wrapperForm.submit()
-      } else {
-        $wrapperForm.find('textarea[data-role=fork-feedback-improve-message]').prop('required', true)
-        $wrapperForm.find('*[data-role=fork-feedback-container]').show()
+
+        return
       }
+
+      $wrapperForm.find('textarea[data-role=fork-feedback-improve-message]').prop('required', true)
+      $wrapperForm.find('[data-role=fork-feedback-container]').show()
     })
   }
 }