jenkins-bot has submitted this change and it was merged.
Change subject: Add form defaults when validation fails due to errors in
Campaigns page when changes are made to an existing campaign
......................................................................
Add form defaults when validation fails due to errors in Campaigns page
when changes are made to an existing campaign
Change-Id: I46323e05bf74d1b511d1e57dc79844e29c0e0100
---
M src/Controllers/Admin/Campaign.php
1 file changed, 17 insertions(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/Controllers/Admin/Campaign.php
b/src/Controllers/Admin/Campaign.php
index 4dfcecc..ad62118 100644
--- a/src/Controllers/Admin/Campaign.php
+++ b/src/Controllers/Admin/Campaign.php
@@ -175,7 +175,7 @@
$questionTitles = $this->form->get( 'qtitles' );
$questionFooters = $this->form->get( 'qfooters' );
$quesDefaults = array();
- if( $id == 'new' ) {
+ if ( $id == 'new' ) {
for ( $idx = 0; $idx < 5; $idx ++ ) {
$quesDefaults[$idx] = array(
'id' => $idx,
@@ -187,6 +187,22 @@
isset(
$questionFooters[$idx] ) ? $questionFooters[$idx] : '',
);
}
+ } else {
+ $prevQuestions = $this->dao->getQuestions( $id
);
+ foreach ( $prevQuestions as $q ) {
+ $idx = $q['id'];
+ $quesDefaults[$idx] = array(
+ 'id' => $idx,
+ 'question_title' =>
+ isset(
$questionTitles[$idx] ) ?
+
$questionTitles[$idx] : $q['question_title'],
+ 'question_body' =>
+ isset( $questions[$idx]
) ? $questions[$idx] : $q['question_body'],
+ 'question_footer' =>
+ isset(
$questionFooters[$idx] ) ?
+
$questionFooters[$idx] : $q['question_footer'],
+ );
+ }
}
$this->flash( 'form_defaults', $quesDefaults );
}
--
To view, visit https://gerrit.wikimedia.org/r/197388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I46323e05bf74d1b511d1e57dc79844e29c0e0100
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/iegreview
Gerrit-Branch: master
Gerrit-Owner: Niharika29 <niharikakohl...@gmail.com>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Niharika29 <niharikakohl...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
