https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113680
Revision: 113680
Author: jeroendedauw
Date: 2012-03-12 22:45:38 +0000 (Mon, 12 Mar 2012)
Log Message:
-----------
fixed some issues and initial work on logging of reviewer adittion and removal
Modified Paths:
--------------
trunk/extensions/EducationProgram/actions/EPAddReviewerAction.php
trunk/extensions/EducationProgram/includes/EPArticle.php
trunk/extensions/EducationProgram/includes/EPArticleTable.php
trunk/extensions/EducationProgram/includes/EPCourse.php
trunk/extensions/EducationProgram/includes/EPStudentPager.php
Modified: trunk/extensions/EducationProgram/actions/EPAddReviewerAction.php
===================================================================
--- trunk/extensions/EducationProgram/actions/EPAddReviewerAction.php
2012-03-12 22:28:25 UTC (rev 113679)
+++ trunk/extensions/EducationProgram/actions/EPAddReviewerAction.php
2012-03-12 22:45:38 UTC (rev 113680)
@@ -36,7 +36,7 @@
if ( $user->matchEditToken( $req->getText( 'token' ), $salt ) )
{
$article = EPArticles::singleton()->selectRow(
- array( 'id', 'reviewers' ),
+ array( 'id', 'reviewers', 'page_id',
'page_title' ),
array( 'id' => $req->getInt( 'article-id' ) )
);
Modified: trunk/extensions/EducationProgram/includes/EPArticle.php
===================================================================
--- trunk/extensions/EducationProgram/includes/EPArticle.php 2012-03-12
22:28:25 UTC (rev 113679)
+++ trunk/extensions/EducationProgram/includes/EPArticle.php 2012-03-12
22:45:38 UTC (rev 113680)
@@ -176,7 +176,14 @@
* @param array $userIds
*/
public function logReviewersAdittion( array $userIds ) {
- // TODO
+ foreach ( $userIds as $userId ) {
+ EPUtils::log( array(
+ 'user' => User::newFromId( $userId ),
+ 'title' => $this->getTitle(),
+ 'type' => 'eparticle',
+ 'subtype' => 'review',
+ ) );
+ }
}
/**
@@ -208,7 +215,14 @@
* @param array $userIds
*/
public function logReviewersRemoval( array $userIds ) {
- // TODO
+ foreach ( $userIds as $userId ) {
+ EPUtils::log( array(
+ 'user' => User::newFromId( $userId ),
+ 'title' => $this->getTitle(),
+ 'type' => 'eparticle',
+ 'subtype' => 'unreview',
+ ) );
+ }
}
}
Modified: trunk/extensions/EducationProgram/includes/EPArticleTable.php
===================================================================
--- trunk/extensions/EducationProgram/includes/EPArticleTable.php
2012-03-12 22:28:25 UTC (rev 113679)
+++ trunk/extensions/EducationProgram/includes/EPArticleTable.php
2012-03-12 22:45:38 UTC (rev 113680)
@@ -518,7 +518,7 @@
*/
protected function doBatchLookups() {
$userIds = array();
- $field = $this->table->getPrefixedField( 'org_id' );
+ $field = $this->table->getPrefixedField( 'user_id' );
while( $student = $this->mResult->fetchObject() ) {
$userIds[] = $student->$field;
Modified: trunk/extensions/EducationProgram/includes/EPCourse.php
===================================================================
--- trunk/extensions/EducationProgram/includes/EPCourse.php 2012-03-12
22:28:25 UTC (rev 113679)
+++ trunk/extensions/EducationProgram/includes/EPCourse.php 2012-03-12
22:45:38 UTC (rev 113680)
@@ -434,7 +434,7 @@
$this->students = array();
foreach ( $this->getField( 'students' ) as $userId ) {
- $this->students[] = EPStudent::newFromUserId(
$userId );
+ $this->students[] = EPStudent::newFromUserId(
$userId, true );
}
}
Modified: trunk/extensions/EducationProgram/includes/EPStudentPager.php
===================================================================
--- trunk/extensions/EducationProgram/includes/EPStudentPager.php
2012-03-12 22:28:25 UTC (rev 113679)
+++ trunk/extensions/EducationProgram/includes/EPStudentPager.php
2012-03-12 22:45:38 UTC (rev 113680)
@@ -201,8 +201,6 @@
$this->courseNames[$courseForUser->upc_user_id][] =
$courseForUser->$courseNameField;
}
}
-
-
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
