Revision: 48565
Author: aaron
Date: 2009-03-19 02:55:21 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
Tweaked level selector and removed duplication
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedRevsXML.php
trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php
Modified: trunk/extensions/FlaggedRevs/FlaggedRevsXML.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevsXML.php 2009-03-19 02:40:48 UTC
(rev 48564)
+++ trunk/extensions/FlaggedRevs/FlaggedRevsXML.php 2009-03-19 02:55:21 UTC
(rev 48565)
@@ -44,15 +44,20 @@
/**
* Get a selector of review levels
* @param int $selected, selected level
+ * @param bool $all all selector?
+ * @param int $max max level?
*/
- public static function getLevelMenu( $selected=null ) {
+ public static function getLevelMenu( $selected=null, $all='all', $max=2
) {
wfLoadExtensionMessages( 'FlaggedRevs' );
$s = "<label for='wpLevel'>" .
wfMsgHtml('revreview-levelfilter') . "</label> ";
$s .= Xml::openElement( 'select', array('name' => 'level','id'
=> 'wpLevel') );
- $s .= Xml::option( wfMsg( "revreview-filter-all" ), -1,
$selected===-1 );
+ if( $all === 'all' )
+ $s .= Xml::option( wfMsg( "revreview-filter-all" ), -1,
$selected===-1 );
$s .= Xml::option( wfMsg( 'revreview-lev-sighted' ), 0,
$selected===0 );
if( FlaggedRevs::qualityVersions() )
$s .= Xml::option( wfMsg( 'revreview-lev-quality' ), 1,
$selected===1 );
+ if( $max >= 2 && FlaggedRevs::pristineVersions() )
+ $s .= Xml::option( wfMsg( 'revreview-lev-pristine' ),
2, $selected===2 );
# Note: Pristine not tracked at sp:QualityOversight (counts as
quality)
$s .= Xml::closeElement('select')."\n";
return $s;
Modified: trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
2009-03-19 02:40:48 UTC (rev 48564)
+++ trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
2009-03-19 02:55:21 UTC (rev 48565)
@@ -70,7 +70,7 @@
'<fieldset><legend>' .
wfMsgHtml('qualityoversight-legend') . '</legend><p>' .
Xml::hidden( 'title', $wgTitle->getPrefixedDBKey() ) .
FlaggedRevsXML::getNamespaceMenu( $this->namespace ) .
' ' .
- FlaggedRevsXML::getLevelMenu( $this->level ) . ' '
.
+ FlaggedRevsXML::getLevelMenu( $this->level, 'all', 1 )
. ' ' .
Xml::inputLabel( wfMsg( 'specialloguserlabel' ),
'user', 'user', 20, $this->user ) . '<br/>' .
FlaggedRevsXML::getStatusFilterMenu( $this->status ) .
' ' .
FlaggedRevsXML::getAutoFilterMenu( $this->automatic ) .
' ' .
Modified: trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php
2009-03-19 02:40:48 UTC (rev 48564)
+++ trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php
2009-03-19 02:55:21 UTC (rev 48565)
@@ -21,8 +21,8 @@
# Check if there is a featured level
$maxType = FlaggedRevs::pristineVersions() ? 2 : 1;
$this->namespace = $wgRequest->getInt( 'namespace' );
- $this->type = $wgRequest->getInt( 'level' );
- $this->type = $this->type <= $maxType ? $this->type : 0;
+ $this->type = $wgRequest->getInt( 'level', -1 );
+ $this->type = min($this->type,$maxType);
$this->showForm();
$this->showPageList();
@@ -38,7 +38,7 @@
if( count($wgFlaggedRevsNamespaces) > 1 ) {
$form .= FlaggedRevsXML::getNamespaceMenu(
$this->namespace ) . ' ';
}
- $form .= self::getLevelMenu( $this->type );
+ $form .= FlaggedRevsXML::getLevelMenu( $this->type );
$form .= " ".Xml::submitButton( wfMsg( 'go' ) );
$form .= Xml::hidden( 'title', $wgTitle->getPrefixedDBKey() );
@@ -84,21 +84,6 @@
return "<li>$link $stxt ($list) [$best]</li>";
}
-
- /**
- * Get a selector of review levels
- * @param int $selected, selected level
- */
- public static function getLevelMenu( $selected=null ) {
- $form = Xml::openElement( 'select', array('name' => 'level') );
- $form .= Xml::option( wfMsg( "reviewedpages-lev-0" ), 0,
$selected==0 );
- if( FlaggedRevs::qualityVersions() )
- $form .= Xml::option( wfMsg( "reviewedpages-lev-1" ),
1, $selected==1 );
- if( FlaggedRevs::pristineVersions() )
- $form .= Xml::option( wfMsg( "reviewedpages-lev-2" ),
2, $selected==2 );
- $form .= Xml::closeElement('select')."\n";
- return $form;
- }
}
/**
@@ -131,13 +116,17 @@
function getQueryInfo() {
$conds = $this->mConds;
$conds[] = 'page_id = fp_page_id';
- $conds['fp_quality'] = $this->type;
- $conds['page_namespace'] = $this->namespace;
+ $index = 'PRIMARY';
+ if( $this->type >= 0 ) {
+ $conds['fp_quality'] = $this->type;
+ $index = 'fp_quality_page';
+ }
+ $conds['page_namespace'] = $this->namespace; // Sanity check NS
return array(
'tables' => array('flaggedpages','page'),
'fields' =>
'page_namespace,page_title,page_len,fp_page_id',
'conds' => $conds,
- 'options' => array( 'USE INDEX' => array('flaggedpages'
=> 'fp_quality_page') )
+ 'options' => array( 'USE INDEX' => array('flaggedpages'
=> $index) )
);
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
