From 0e8ee234f87afef0b23b762a2f126820e053c854 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Tue, 9 Nov 2021 12:36:53 +0900
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E4=B8=8D=E8=A6=81=E3=81=AA?=
 =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E5=89=8A=E9=99=A4=20=E2=80=BB?=
 =?UTF-8?q?=E5=88=9D=E6=9C=9F=E8=A8=AD=E8=A8=88=E3=81=A7=E3=81=AF=E3=80=81?=
 =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E5=90=8D=E3=82=92=E8=87=AA=E7=94=B1?=
 =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=A7=E3=81=8D=E3=82=8B=E8=A8=AD?=
 =?UTF-8?q?=E8=A8=88=E3=81=A0=E3=81=A3=E3=81=9F=E3=81=8C=E3=80=81=E3=81=9D?=
 =?UTF-8?q?=E3=81=AE=E4=BB=95=E6=A7=98=E3=81=AF=E7=84=A1=E3=81=8F=E3=81=AA?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F(=EF=BC=9F)=E3=81=9F=E3=82=81=E4=B8=8D?=
 =?UTF-8?q?=E8=A6=81=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QuestionnaireEdit/EditQuestion/hidden_page_info_set.ctp     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/View/Elements/QuestionnaireEdit/EditQuestion/hidden_page_info_set.ctp b/View/Elements/QuestionnaireEdit/EditQuestion/hidden_page_info_set.ctp
index efb39fd..80b5e6b 100644
--- a/View/Elements/QuestionnaireEdit/EditQuestion/hidden_page_info_set.ctp
+++ b/View/Elements/QuestionnaireEdit/EditQuestion/hidden_page_info_set.ctp
@@ -15,5 +15,3 @@
 	array('ng-value' => 'page.pageSequence'));
 	echo $this->NetCommonsForm->hidden('QuestionnairePage.{{pageIndex}}.key',
 	array('ng-value' => 'page.key'));
-	$this->NetCommonsForm->hidden('QuestionnairePage.{{pageIndex}}.page_title',
-	array('ng-value' => 'page.pageTitle'));

From 9f4256f7b050f8e5ddd2c05e4b2099ad1ea54e1f Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Tue, 9 Nov 2021 14:53:58 +0900
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E3=83=AD=E3=82=B8=E3=83=83?=
 =?UTF-8?q?=E3=82=AF=E7=9A=84=E3=81=AB=E3=81=AF=E3=80=81div=E3=82=BF?=
 =?UTF-8?q?=E3=82=B0=E3=82=92if=E6=96=87=E3=81=AE=E5=A4=96=E3=81=AB?=
 =?UTF-8?q?=E3=81=82=E3=82=8B=E3=81=B9=E3=81=8D=E3=81=AA=E3=81=AE=E3=81=A7?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E2=80=BB=E3=81=9F=E3=81=A0=E3=81=97?=
 =?UTF-8?q?=E3=80=81$options['ng-model']=E3=81=8C=E5=BF=85=E3=81=9A?=
 =?UTF-8?q?=E5=BC=95=E6=95=B0=E3=81=AB=E5=90=AB=E3=81=BE=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E3=81=9F=E3=82=81=E5=BF=85=E3=81=9Aif=E6=96=87=E3=81=8C?=
 =?UTF-8?q?=E9=80=9A=E3=82=8B=E3=81=AE=E3=81=A7=E3=80=81=E3=81=9D=E3=82=82?=
 =?UTF-8?q?=E3=81=9D=E3=82=82if=E6=96=87=E8=87=AA=E4=BD=93=E3=81=AF?=
 =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=A0=E3=81=8C=E3=80=81=E5=BF=B5=E3=81=AE?=
 =?UTF-8?q?=E3=81=9F=E3=82=81if=E6=96=87=E3=81=AF=E6=AE=8B=E3=81=99?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 View/Helper/QuestionEditHelper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/View/Helper/QuestionEditHelper.php b/View/Helper/QuestionEditHelper.php
index dc6f6e1..8b2fbf1 100644
--- a/View/Helper/QuestionEditHelper.php
+++ b/View/Helper/QuestionEditHelper.php
@@ -75,9 +75,9 @@ public function questionInput($fieldName, $title, $options, $label = '') {
 		if (isset($options['ng-model'])) {
 			$ret .= '<div class="has-error" ng-if="' . $errorMsgModelName . '">';
 			$ret .= '<div class="help-block" ng-repeat="errorMessage in ' . $errorMsgModelName . '">';
-				$ret .= '{{errorMessage}}</div></div>';
-			$ret .= '</div></div>';
+			$ret .= '{{errorMessage}}</div></div>';
 		}
+		$ret .= '</div></div>';
 
 		return $ret;
 	}