r108972 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r108971‎ | r108972 | r108973 >
Date:13:06, 15 January 2012
Author:jeroendedauw
Status:ok
Tags:
Comment:
Follow up to r108934; rem refs to removed field
Modified paths:
  • /trunk/extensions/EducationProgram/EducationProgram.i18n.php (modified) (history)
  • /trunk/extensions/EducationProgram/includes/EPOrg.php (modified) (history)
  • /trunk/extensions/EducationProgram/specials/SpecialInstitution.php (modified) (history)

Diff [purge]

Index: trunk/extensions/EducationProgram/specials/SpecialInstitution.php
@@ -100,7 +100,6 @@
101101
102102 $stats['courses'] = $this->getLanguage()->formatNum( $org->getField( 'courses' ) );
103103 $stats['terms'] = $this->getLanguage()->formatNum( $org->getField( 'terms' ) );
104 - $stats['ambassadors'] = $this->getLanguage()->formatNum( $org->getField( 'mentors' ) );
105104 $stats['students'] = $this->getLanguage()->formatNum( $org->getField( 'students' ) );
106105
107106 foreach ( $stats as &$stat ) {
Index: trunk/extensions/EducationProgram/includes/EPOrg.php
@@ -85,7 +85,7 @@
8686 */
8787 public function loadSummaryFields( $summaryFields = null ) {
8888 if ( is_null( $summaryFields ) ) {
89 - $summaryFields = array( 'courses', 'terms', 'mentors', 'students', 'active' );
 89+ $summaryFields = array( 'courses', 'terms', 'students', 'active' );
9090 }
9191 else {
9292 $summaryFields = (array)$summaryFields;
@@ -103,16 +103,6 @@
104104
105105 $dbr = wfGetDB( DB_SLAVE );
106106
107 - if ( in_array( 'mentors', $summaryFields ) ) {
108 - $fields['mentors'] = $dbr->select(
109 - 'ep_mentors_per_org',
110 - 'COUNT(*) AS rowcount',
111 - array( 'mpo_org_id' => $this->getId() )
112 - );
113 -
114 - $fields['mentors'] = $fields['mentors']->rowcount;
115 - }
116 -
117107 if ( in_array( 'students', $summaryFields ) ) {
118108 $termIds = EPTerm::selectFields( 'id', array( 'org_id' => $this->getId() ) );
119109
Index: trunk/extensions/EducationProgram/EducationProgram.i18n.php
@@ -176,7 +176,6 @@
177177 'eporgpager-header-country' => 'Country',
178178 'eporgpager-filter-country' => 'Country',
179179 'eporgpager-header-courses' => 'Courses',
180 - 'eporgpager-header-mentors' => 'Ambassadors',
181180 'eporgpager-header-students' => 'Students',
182181 'eporgpager-header-terms' => 'Terms',
183182 'eporgpager-header-active' => 'Active',
@@ -270,7 +269,6 @@
271270 'specialinstitution-summary-courses' => 'Course count',
272271 'specialinstitution-summary-terms' => 'Term count',
273272 'specialinstitution-summary-students' => 'Student count',
274 - 'specialinstitution-summary-ambassadors' => 'Ambassador count',
275273 'ep-institution-nav-edit' => 'Edit this institution',
276274 'ep-institution-add-course' => 'Add a course',
277275 'ep-institution-inactive' => 'Inactive',

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r108934drop mentors field in orgs tablejeroendedauw18:35, 14 January 2012

Status & tagging log