https://www.mediawiki.org/wiki/Special:Code/MediaWiki/108348
Revision: 108348
Author: jeroendedauw
Date: 2012-01-08 06:12:33 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
work on org and term pagers
Modified Paths:
--------------
trunk/extensions/EducationProgram/EducationProgram.i18n.php
trunk/extensions/EducationProgram/includes/EPOrgPager.php
trunk/extensions/EducationProgram/includes/EPPager.php
trunk/extensions/EducationProgram/includes/EPTermPager.php
Modified: trunk/extensions/EducationProgram/EducationProgram.i18n.php
===================================================================
--- trunk/extensions/EducationProgram/EducationProgram.i18n.php 2012-01-08
04:56:52 UTC (rev 108347)
+++ trunk/extensions/EducationProgram/EducationProgram.i18n.php 2012-01-08
06:12:33 UTC (rev 108348)
@@ -147,6 +147,7 @@
'eptermpager-header-end' => 'End',
'eptermpager-filter-course-id' => 'Course',
'eptermpager-filter-year' => 'Year',
+ 'eptermpager-filter-org-id' => 'Institution',
// Student pager
'epstudentpager-header-user-id' => 'User',
Modified: trunk/extensions/EducationProgram/includes/EPOrgPager.php
===================================================================
--- trunk/extensions/EducationProgram/includes/EPOrgPager.php 2012-01-08
04:56:52 UTC (rev 108347)
+++ trunk/extensions/EducationProgram/includes/EPOrgPager.php 2012-01-08
06:12:33 UTC (rev 108348)
@@ -72,7 +72,18 @@
$value = htmlspecialchars( $countries[$value] );
break;
case 'courses': case 'mentors': case 'students': case
'terms':
+ $rawValue = $value;
$value = htmlspecialchars(
$this->getLanguage()->formatNum( $value ) );
+
+ if ( $rawValue > 0 && in_array( $name, array(
'terms', 'courses' ) ) ) {
+ $value = Linker::linkKnown(
+ SpecialPage::getTitleFor(
$this->getLanguage()->ucfirst( $name ) ),
+ $value,
+ array(),
+ array( 'org_id' =>
$this->currentObject->getId() )
+ );
+ }
+
break;
}
Modified: trunk/extensions/EducationProgram/includes/EPPager.php
===================================================================
--- trunk/extensions/EducationProgram/includes/EPPager.php 2012-01-08
04:56:52 UTC (rev 108347)
+++ trunk/extensions/EducationProgram/includes/EPPager.php 2012-01-08
06:12:33 UTC (rev 108348)
@@ -441,7 +441,7 @@
protected function addFilterValues( array &$filterOptions, $cast = true
) {
$req = $this->getRequest();
$changed = false;
-
+
foreach ( $filterOptions as $optionName => &$optionData ) {
if ( $req->getCheck( $optionName ) ) {
$optionData['value'] = $req->getVal(
$optionName );
Modified: trunk/extensions/EducationProgram/includes/EPTermPager.php
===================================================================
--- trunk/extensions/EducationProgram/includes/EPTermPager.php 2012-01-08
04:56:52 UTC (rev 108347)
+++ trunk/extensions/EducationProgram/includes/EPTermPager.php 2012-01-08
06:12:33 UTC (rev 108348)
@@ -116,6 +116,15 @@
'value' => '',
'datatype' => 'int',
),
+ 'org_id' => array(
+ 'type' => 'select',
+ 'options' => array_merge(
+ array( '' => '' ),
+ EPOrg::getOrgOptions( EPOrg::select(
array( 'name', 'id' ) ) )
+ ),
+ 'value' => '',
+ 'datatype' => 'int',
+ ),
'year' => array(
'type' => 'select',
'options' => $years,
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
