http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90052
Revision: 90052
Author: aaron
Date: 2011-06-14 14:57:18 +0000 (Tue, 14 Jun 2011)
Log Message:
-----------
Tweaked r90033: Improved API param names. Also decreased deadvertiseReviewing()
JS timeout a bit.
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/api/actions/ApiReviewActivity.php
trunk/extensions/FlaggedRevs/presentation/modules/review.js
Modified: trunk/extensions/FlaggedRevs/api/actions/ApiReviewActivity.php
===================================================================
--- trunk/extensions/FlaggedRevs/api/actions/ApiReviewActivity.php
2011-06-14 14:56:15 UTC (rev 90051)
+++ trunk/extensions/FlaggedRevs/api/actions/ApiReviewActivity.php
2011-06-14 14:57:18 UTC (rev 90052)
@@ -43,7 +43,7 @@
$this->dieUsageMsg( array( 'blockedtext' ) );
}
- $newRev = Revision::newFromId( $params['newid'] );
+ $newRev = Revision::newFromId( $params['oldid'] );
if ( !$newRev || !$newRev->getTitle() ) {
$this->dieUsage( "Cannot find a revision with the
specified ID.", 'notarget' );
}
@@ -55,19 +55,19 @@
}
$status = false;
- if ( $params['oldid'] ) { // changes
- $oldRev = Revision::newFromId( $params['oldid'] );
+ if ( $params['previd'] ) { // changes
+ $oldRev = Revision::newFromId( $params['previd'] );
if ( !$oldRev || $oldRev->getPage() !=
$newRev->getPage() ) {
$this->dieUsage( "Revisions do not belong to
the same page.", 'notarget' );
}
// Mark as reviewing...
if ( $params['reviewing'] ) {
$status = FRUserActivity::setUserReviewingDiff(
- $wgUser, $params['oldid'],
$params['newid'] );
+ $wgUser, $params['previd'],
$params['oldid'] );
// Unmark as reviewing...
} else {
$status =
FRUserActivity::clearUserReviewingDiff(
- $wgUser, $params['oldid'],
$params['newid'] );
+ $wgUser, $params['previd'],
$params['oldid'] );
}
} else {
// Mark as reviewing...
@@ -100,16 +100,16 @@
public function getAllowedParams() {
return array(
- 'oldid' => null,
- 'newid' => null,
+ 'previd' => null,
+ 'oldid' => null,
'reviewing' => array( ApiBase::PARAM_TYPE => array( 0,
1 ) )
);
}
public function getParamDescription() {
return array(
- 'oldid' => 'The old revision ID (for reviewing
changes or pages)',
- 'newid' => 'The new revision ID (for reviewing
changes only)',
+ 'previd' => 'The prior revision ID (for
reviewing changes only)',
+ 'oldid' => 'The ID of the revision being
reviewed',
'reviewing' => 'Whether to advertising as reviewing or
no longer reviewing',
);
}
Modified: trunk/extensions/FlaggedRevs/presentation/modules/review.js
===================================================================
--- trunk/extensions/FlaggedRevs/presentation/modules/review.js 2011-06-14
14:56:15 UTC (rev 90051)
+++ trunk/extensions/FlaggedRevs/presentation/modules/review.js 2011-06-14
14:57:18 UTC (rev 90052)
@@ -336,13 +336,13 @@
url : wgScriptPath + '/api.php',
data : {
action : 'reviewactivity',
- oldid : oRevId,
- newid : nRevId,
+ previd : oRevId,
+ oldid : nRevId,
reviewing : 0
},
type : "POST",
dataType: "html", // response type
- timeout : 2500, // don't delay user exiting
+ timeout : 2000, // don't delay user exiting
async : false
});
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
