From 7f1488aae48f25d0b746f56193613d664d739d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Farr=C3=A9?= <contact@marc.fun>
Date: Thu, 25 Dec 2025 11:08:19 +0000
Subject: [PATCH] Draft - Fix validation issues
 https://github.com/humhub/humhub-internal/issues/992

---
 docs/CHANGELOG.md                 |  1 +
 views/poll/edit.php               | 10 +++++-----
 widgets/AddAnswerInput.php        |  8 +++++++-
 widgets/views/addAnswersInput.php | 21 +++++++++++++--------
 widgets/views/form.php            |  4 ++--
 5 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index bd1014ac..c0666fdc 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -4,6 +4,7 @@ Changelog
 1.4.3 - (Unreleased)
 ---------------------------
 - Enh #164: Convert swagger docs to OpenAPI 3.0
+- Fix: New Poll missing Answers validation
 
 1.4.2 (November 11, 2025)
 -------------------------
diff --git a/views/poll/edit.php b/views/poll/edit.php
index e1ba4117..6e7ea606 100644
--- a/views/poll/edit.php
+++ b/views/poll/edit.php
@@ -1,12 +1,12 @@
 <?php
 
-use humhub\modules\content\widgets\richtext\RichTextField;
-use humhub\widgets\form\ActiveForm;
 use humhub\helpers\Html;
+use humhub\modules\content\widgets\richtext\RichTextField;
 use humhub\modules\polls\widgets\AddAnswerInput;
-use humhub\widgets\bootstrap\Button;
-use humhub\widgets\bootstrap\Alert;
 use humhub\modules\ui\icon\widgets\Icon;
+use humhub\widgets\bootstrap\Alert;
+use humhub\widgets\bootstrap\Button;
+use humhub\widgets\form\ActiveForm;
 
 /** @var  $poll \humhub\modules\polls\models\Poll */
 
@@ -42,7 +42,7 @@ class="form-control tt poll_answer_old_input"
         <?php endforeach; ?>
 
         <?php if (!$poll->closed) : ?>
-            <?= AddAnswerInput::widget(['name' => 'newAnswers[]', 'showTitle' => true]); ?>
+            <?= AddAnswerInput::widget(['model' => $poll, 'name' => 'newAnswers[]', 'showTitle' => true]); ?>
         <?php endif; ?>
 
 
diff --git a/widgets/AddAnswerInput.php b/widgets/AddAnswerInput.php
index 0e9ef134..4017dce9 100644
--- a/widgets/AddAnswerInput.php
+++ b/widgets/AddAnswerInput.php
@@ -3,6 +3,7 @@
 namespace humhub\modules\polls\widgets;
 
 use humhub\components\Widget;
+use humhub\modules\polls\models\Poll;
 
 /**
  * PollWallEntryWidget is used to display a poll inside the stream.
@@ -15,12 +16,17 @@
  */
 class AddAnswerInput extends Widget
 {
+    public Poll $model;
     public $name;
     public $showTitle;
 
     public function run()
     {
-        return $this->render('addAnswersInput', ['name' => $this->name, 'showTitle' => $this->showTitle]);
+        return $this->render('addAnswersInput', [
+            'model' => $this->model,
+            'name' => $this->name,
+            'showTitle' => $this->showTitle,
+        ]);
     }
 
 }
diff --git a/widgets/views/addAnswersInput.php b/widgets/views/addAnswersInput.php
index e040eb5a..cc5069f1 100644
--- a/widgets/views/addAnswersInput.php
+++ b/widgets/views/addAnswersInput.php
@@ -1,7 +1,10 @@
 <?php
 
+use humhub\helpers\Html;
+use humhub\modules\polls\models\Poll;
 use humhub\modules\ui\icon\widgets\Icon;
 
+/* @var $model Poll */
 /* @var $name String */
 /* @var $showTitle Boolean */
 
@@ -10,10 +13,11 @@
 
 <div class="mb-3">
     <div class="input-group">
-        <input type="text" name="<?= $name ?>" 
-               class="form-control poll_answer_new_input contentForm"
-               placeholder="<?= Yii::t('PollsModule.base', "Add answer...") ?>"
-               title="<?= $title ?>"/>
+        <?= Html::activeInput('text', $model, $name, [
+            'class' => 'form-control poll_answer_new_input contentForm',
+            'placeholder' => Yii::t('PollsModule.base', "Add answer..."),
+            'title' => $title,
+        ]) ?>
         <div class="input-group-text" style="cursor:pointer;" data-action-click="removePollAnswer">
             <?= Icon::get('trash') ?>
         </div>
@@ -21,10 +25,11 @@ class="form-control poll_answer_new_input contentForm"
 </div>
 <div class="mb-3">
     <div class="input-group">
-        <input type="text" name="<?= $name ?>" 
-               class="form-control poll_answer_new_input contentForm"
-               placeholder="<?= Yii::t('PollsModule.base', "Add answer...") ?>"
-               title="<?= $title ?>"/>
+        <?= Html::activeInput('text', $model, $name, [
+            'class' => 'form-control poll_answer_new_input contentForm',
+            'placeholder' => Yii::t('PollsModule.base', "Add answer..."),
+            'title' => $title,
+        ]) ?>
         <div class="input-group-text addPollAnswerButton" data-action-click="addPollAnswer" style="cursor:pointer">
             <?= Icon::get('plus') ?>
         </div>
diff --git a/widgets/views/form.php b/widgets/views/form.php
index 7e5dd4dc..c9bdef55 100644
--- a/widgets/views/form.php
+++ b/widgets/views/form.php
@@ -1,12 +1,12 @@
 <?php
 
+use humhub\helpers\Html;
 use humhub\modules\content\widgets\richtext\RichTextField;
 use humhub\modules\content\widgets\WallCreateContentFormFooter;
 use humhub\modules\polls\assets\PollsAsset;
 use humhub\modules\polls\models\Poll;
 use humhub\modules\polls\widgets\AddAnswerInput;
 use humhub\widgets\form\ActiveForm;
-use humhub\helpers\Html;
 
 /* @var $model Poll */
 /* @var $form ActiveForm */
@@ -23,7 +23,7 @@
     ])->label(false) ?>
 
     <?= Html::activeLabel($model, 'answersText', ['label' => Yii::t('PollsModule.base', 'Answers'), 'class' => 'control-label']); ?>
-    <?= AddAnswerInput::widget(['name' => 'newAnswers[]', 'showTitle' => false]); ?>
+    <?= AddAnswerInput::widget(['model' => $model, 'name' => 'newAnswers[]', 'showTitle' => false]); ?>
 
     <div class="container">
         <div class="row">