[MediaWiki-commits] [Gerrit] Missing argument exception on accessing Aggregated Scores page - change (wikimedia/iegreview)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Missing argument exception on accessing Aggregated Scores page
......................................................................


Missing argument exception on accessing Aggregated Scores page

Change-Id: Ib726343b21221f47ecf5aa42fe770390665bacd4
---
M src/Controllers/Reports/AbstractReport.php
M src/Controllers/Reports/Aggregated.php
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Niharika29: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/Controllers/Reports/AbstractReport.php 
b/src/Controllers/Reports/AbstractReport.php
index ce71593..b53f298 100644
--- a/src/Controllers/Reports/AbstractReport.php
+++ b/src/Controllers/Reports/AbstractReport.php
@@ -43,7 +43,7 @@
         * 'sortable' => true/false
         * @return array Column descriptions
         */
-       abstract protected function describeColumns();
+       abstract protected function describeColumns( $campaign );
 
        /**
         * @return stdClass Results object
@@ -91,7 +91,7 @@
                $this->setupForm();
                $this->form->validate( $_GET );
 
-               $this->view->setData( 'columns', $this->describeColumns() );
+               $this->view->setData( 'columns', $this->describeColumns( 
$campaign ) );
 
                $this->view->set( 'items', $this->form->get( 'items' ) );
                $this->view->set( 'p', $this->form->get( 'p' ) );
diff --git a/src/Controllers/Reports/Aggregated.php 
b/src/Controllers/Reports/Aggregated.php
index 5ca63af..75ce639 100644
--- a/src/Controllers/Reports/Aggregated.php
+++ b/src/Controllers/Reports/Aggregated.php
@@ -42,7 +42,7 @@
        /**
         * @return array Column descriptions
         */
-       protected function describeColumns() {
+       protected function describeColumns( $campaign ) {
                $columns = array(
                        'report-aggregated-proposal' => array(
                                'column' => 'id',
@@ -65,7 +65,7 @@
                        ),
                );
 
-               foreach ( $this->getQuestions() as $question ) {
+               foreach ( $this->getQuestions( $this->$campaign ) as $question 
) {
                        if ( $question['type'] === 'score' ) {
                                $columns["q{$question['id']}"] = array(
                                        'header' => $question['report_head'],

-- 
To view, visit https://gerrit.wikimedia.org/r/227876
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib726343b21221f47ecf5aa42fe770390665bacd4
Gerrit-PatchSet: 1
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