Niharika29 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216537
Change subject: Allow multiple campaigns to run in parallel
......................................................................
Allow multiple campaigns to run in parallel
Change-Id: Idd9265fa0bb4ebf8db453c852dd7e4812108c7c1
---
M src/Controllers/Admin/Campaign.php
M src/Controllers/Proposals/Edit.php
2 files changed, 2 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/iegreview
refs/changes/37/216537/1
diff --git a/src/Controllers/Admin/Campaign.php
b/src/Controllers/Admin/Campaign.php
index 6e6169e..539b47e 100644
--- a/src/Controllers/Admin/Campaign.php
+++ b/src/Controllers/Admin/Campaign.php
@@ -92,11 +92,6 @@
);
}
- if ( is_numeric( $this->activeCampaign ) ) {
- $this->flashNow( 'error',
- $this->i18nContext->message(
'admin-new-campaign-in-progress' )
- );
- }
} else {
$campaign = $this->dao->getCampaign( $id );
$currentReviewers = $this->dao->getReviewers( $id );
@@ -162,11 +157,7 @@
$questionFooters = $this->form->get( 'qfooters' );
$questionReportHeads = $this->form->get( 'qreporthead'
);
- if ( $id == 'new' && $this->dao->activeCampaign() ) {
- $this->flash( 'error',
- $this->i18nContext->message(
'admin-new-campaign-in-progress' )
- );
- } elseif ( $id == 'new' ) {
+ if ( $id == 'new' ) {
// This is a temporary fix to make the *just
started* campaign
// active and bypass the actual start and end
date to be fixed
// in a subsequent patch when actual logic for
using start and
diff --git a/src/Controllers/Proposals/Edit.php
b/src/Controllers/Proposals/Edit.php
index 3d0dfc5..f8e7eed 100644
--- a/src/Controllers/Proposals/Edit.php
+++ b/src/Controllers/Proposals/Edit.php
@@ -69,7 +69,7 @@
'default' => $defaults['notes'],
) );
- $this->form->requireInArray( 'status',
+ $this->form->expectInArray( 'status',
array( 'open', 'abandoned', 'accepted', 'rejected' ),
array(
'default' => $defaults['status'],
--
To view, visit https://gerrit.wikimedia.org/r/216537
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd9265fa0bb4ebf8db453c852dd7e4812108c7c1
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/iegreview
Gerrit-Branch: master
Gerrit-Owner: Niharika29 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
