https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114779
Revision: 114779
Author: raindrift
Date: 2012-04-06 21:34:52 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
all the filters work, sort direction is preserved when the filters are changed
Modified Paths:
--------------
trunk/extensions/PageTriage/PageTriage.php
trunk/extensions/PageTriage/api/ApiPageTriageList.php
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
Modified: trunk/extensions/PageTriage/PageTriage.php
===================================================================
--- trunk/extensions/PageTriage/PageTriage.php 2012-04-06 21:32:44 UTC (rev
114778)
+++ trunk/extensions/PageTriage/PageTriage.php 2012-04-06 21:34:52 UTC (rev
114779)
@@ -264,6 +264,7 @@
'pagetriage-filter-stat-orphan',
'pagetriage-filter-stat-non-autoconfirmed',
'pagetriage-filter-stat-blocked',
+ 'pagetriage-filter-stat-username',
'pagetriage-filter-all',
)
);
Modified: trunk/extensions/PageTriage/api/ApiPageTriageList.php
===================================================================
--- trunk/extensions/PageTriage/api/ApiPageTriageList.php 2012-04-06
21:32:44 UTC (rev 114778)
+++ trunk/extensions/PageTriage/api/ApiPageTriageList.php 2012-04-06
21:34:52 UTC (rev 114779)
@@ -131,11 +131,11 @@
if ( $opts[$key] ) {
if( $val['val'] === false ) {
// if val is false, use the value that
was supplied via the api call
- $tagConds = " ptrpt_page_id =
ptrp_page_id AND ptrpt_tag_id = '" . $tags[$val['name']] . "' AND
- ptrpt_value " .
$val['op'] . " " . $dbr->addQuotes( $opts['key'] );
+ $tagConds = " ptrpt_page_id =
ptrp_page_id AND ptrpt_tag_id = '" . $tags[$val['name']] . "' AND ptrpt_value "
.
+ $val['op'] . " " .
$dbr->addQuotes( $opts[$key] );
} else {
- $tagConds = " ptrpt_page_id =
ptrp_page_id AND ptrpt_tag_id = '" . $tags[$val['name']] . "' AND
- ptrpt_value " .
$val['op'] . " " . $dbr->addQuotes( $val['val'] );
+ $tagConds = " ptrpt_page_id =
ptrp_page_id AND ptrpt_tag_id = '" . $tags[$val['name']] . "' AND ptrpt_value "
.
+ $val['op'] . " " .
$dbr->addQuotes( $val['val'] );
}
break;
}
Modified:
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
===================================================================
---
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
2012-04-06 21:32:44 UTC (rev 114778)
+++
trunk/extensions/PageTriage/modules/ext.pageTriage.views/ext.pageTriage.listControlNav.js
2012-04-06 21:34:52 UTC (rev 114779)
@@ -180,6 +180,7 @@
// persist the limit parameter
apiParams['limit'] = this.model.getParam('limit');
+ apiParams['dir'] = this.model.getParam('dir');
this.model.setParams( apiParams );
this.model.fetch();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
