| Index: trunk/extensions/EducationProgram/includes/EPOrgPager.php |
| — | — | @@ -72,7 +72,18 @@ |
| 73 | 73 | $value = htmlspecialchars( $countries[$value] ); |
| 74 | 74 | break; |
| 75 | 75 | case 'courses': case 'mentors': case 'students': case 'terms': |
| | 76 | + $rawValue = $value; |
| 76 | 77 | $value = htmlspecialchars( $this->getLanguage()->formatNum( $value ) ); |
| | 78 | + |
| | 79 | + if ( $rawValue > 0 && in_array( $name, array( 'terms', 'courses' ) ) ) { |
| | 80 | + $value = Linker::linkKnown( |
| | 81 | + SpecialPage::getTitleFor( $this->getLanguage()->ucfirst( $name ) ), |
| | 82 | + $value, |
| | 83 | + array(), |
| | 84 | + array( 'org_id' => $this->currentObject->getId() ) |
| | 85 | + ); |
| | 86 | + } |
| | 87 | + |
| 77 | 88 | break; |
| 78 | 89 | } |
| 79 | 90 | |
| Index: trunk/extensions/EducationProgram/includes/EPTermPager.php |
| — | — | @@ -116,6 +116,15 @@ |
| 117 | 117 | 'value' => '', |
| 118 | 118 | 'datatype' => 'int', |
| 119 | 119 | ), |
| | 120 | + 'org_id' => array( |
| | 121 | + 'type' => 'select', |
| | 122 | + 'options' => array_merge( |
| | 123 | + array( '' => '' ), |
| | 124 | + EPOrg::getOrgOptions( EPOrg::select( array( 'name', 'id' ) ) ) |
| | 125 | + ), |
| | 126 | + 'value' => '', |
| | 127 | + 'datatype' => 'int', |
| | 128 | + ), |
| 120 | 129 | 'year' => array( |
| 121 | 130 | 'type' => 'select', |
| 122 | 131 | 'options' => $years, |
| Index: trunk/extensions/EducationProgram/includes/EPPager.php |
| — | — | @@ -441,7 +441,7 @@ |
| 442 | 442 | protected function addFilterValues( array &$filterOptions, $cast = true ) { |
| 443 | 443 | $req = $this->getRequest(); |
| 444 | 444 | $changed = false; |
| 445 | | - |
| | 445 | + |
| 446 | 446 | foreach ( $filterOptions as $optionName => &$optionData ) { |
| 447 | 447 | if ( $req->getCheck( $optionName ) ) { |
| 448 | 448 | $optionData['value'] = $req->getVal( $optionName ); |
| Index: trunk/extensions/EducationProgram/EducationProgram.i18n.php |
| — | — | @@ -147,6 +147,7 @@ |
| 148 | 148 | 'eptermpager-header-end' => 'End', |
| 149 | 149 | 'eptermpager-filter-course-id' => 'Course', |
| 150 | 150 | 'eptermpager-filter-year' => 'Year', |
| | 151 | + 'eptermpager-filter-org-id' => 'Institution', |
| 151 | 152 | |
| 152 | 153 | // Student pager |
| 153 | 154 | 'epstudentpager-header-user-id' => 'User', |