Merge "RCFilters: Prevent live update fetch if model is in conflict"

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 46f7927..6ef75e0 100644 (file)
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -196,9 +196,9 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
                        $out->addJsConfigVars(
                                'StructuredChangeFiltersDisplayConfig',
                                [
-                                       'maxLimit' => (int)$this->getConfig()->get( 'RCMaxAge' ) / ( 24 * 3600 ), // Translate to days
-                                       'arrayLimit' => $this->getConfig()->get( 'RCLinkLimits' ),
-                                       'arrayDays' => $this->getConfig()->get( 'RCLinkDays' ),
+                                       'maxDays' => (int)$this->getConfig()->get( 'RCMaxAge' ) / ( 24 * 3600 ), // Translate to days
+                                       'limitArray' => $this->getConfig()->get( 'RCLinkLimits' ),
+                                       'daysArray' => $this->getConfig()->get( 'RCLinkDays' ),
                                ]
                        );
                }

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 497c87b..8f0ebb1 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1350,7 +1350,7 @@
        "recentchanges-legend-plusminus": "(<em>±123</em>)",
        "recentchanges-submit": "Show",
        "rcfilters-legend-heading": "<strong>List of abbreviations:</strong>",
-       "rcfilters-other-review-tools": "<strong>Other review tools:</strong>",
+       "rcfilters-other-review-tools": "<strong>Other review tools</strong>",
        "rcfilters-group-results-by-page": "Group results by page",
        "rcfilters-grouping-title": "Grouping",
        "rcfilters-activefilters": "Active filters",

diff --git a/maintenance/rebuildrecentchanges.php b/maintenance/rebuildrecentchanges.php
index 142a4e5..5df432e 100644 (file)
--- a/maintenance/rebuildrecentchanges.php
+++ b/maintenance/rebuildrecentchanges.php
@@ -156,9 +156,7 @@ class RebuildRecentchanges extends Maintenance {
                                        'rc_this_oldid' => $row->rev_id,
                                        'rc_last_oldid' => 0, // is this ok?
                                        'rc_type' => $row->page_is_new ? RC_NEW : RC_EDIT,
-                                       'rc_source' => $row->page_is_new
-                                               ? $dbw->addQuotes( RecentChange::SRC_NEW )
-                                               : $dbw->addQuotes( RecentChange::SRC_EDIT )
+                                       'rc_source' => $row->page_is_new ? RecentChange::SRC_NEW : RecentChange::SRC_EDIT
                                        ,
                                        'rc_deleted' => $row->rev_deleted
                                ],
@@ -239,9 +237,7 @@ class RebuildRecentchanges extends Maintenance {
                                                'rc_last_oldid' => $lastOldId,
                                                'rc_new' => $new,
                                                'rc_type' => $new ? RC_NEW : RC_EDIT,
-                                               'rc_source' => $new === 1
-                                                       ? $dbw->addQuotes( RecentChange::SRC_NEW )
-                                                       : $dbw->addQuotes( RecentChange::SRC_EDIT ),
+                                               'rc_source' => $new === 1 ? RecentChange::SRC_NEW : RecentChange::SRC_EDIT,
                                                'rc_old_len' => $lastSize,
                                                'rc_new_len' => $size,
                                        ],
@@ -325,7 +321,7 @@ class RebuildRecentchanges extends Maintenance {
                                        'rc_this_oldid' => 0,
                                        'rc_last_oldid' => 0,
                                        'rc_type' => RC_LOG,
-                                       'rc_source' => $dbw->addQuotes( RecentChange::SRC_LOG ),
+                                       'rc_source' => RecentChange::SRC_LOG,
                                        'rc_cur_id' => $field->isNullable()
                                                ? $row->page_id
                                                : (int)$row->page_id, // NULL => 0,

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index f3ea248..30bec87 100644 (file)
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -105,7 +105,7 @@
                                        allowArbitrary: true,
                                        validate: $.isNumeric,
                                        range: {
-                                               min: 1,
+                                               min: 0, // The server normalizes negative numbers to 0 results
                                                max: 1000
                                        },
                                        sortFunc: function ( a, b ) { return Number( a.name ) - Number( b.name ); },
@@ -115,7 +115,7 @@
                                        // we should remove all sticky behavior methods completely
                                        // See T172156
                                        // isSticky: true,
-                                       filters: displayConfig.arrayLimit.map( function ( num ) {
+                                       filters: displayConfig.limitArray.map( function ( num ) {
                                                return controller._createFilterDataFromNumber( num, num );
                                        } )
                                },
@@ -128,7 +128,7 @@
                                        validate: $.isNumeric,
                                        range: {
                                                min: 0,
-                                               max: displayConfig.maxLimit
+                                               max: displayConfig.maxDays
                                        },
                                        sortFunc: function ( a, b ) { return Number( a.name ) - Number( b.name ); },
                                        numToLabelFunc: function ( i ) {
@@ -143,7 +143,7 @@
                                                // Hours (1, 2, 6, 12)
                                                0.04166, 0.0833, 0.25, 0.5
                                        // Days
-                                       ].concat( displayConfig.arrayDays )
+                                       ].concat( displayConfig.daysArray )
                                                .map( function ( num ) {
                                                        return controller._createFilterDataFromNumber(
                                                                num,

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index 7f0d34e..d48d52d 100644 (file)
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -7,6 +7,10 @@
        .mw-recentchanges-toplinks {
                padding: 0 0.5em;
 
+               .oo-ui-widget-enabled.oo-ui-buttonElement.oo-ui-buttonElement-frameless .oo-ui-buttonElement-button {
+                       padding: 0 2.5em 0 0.5em;
+               }
+
                &-title,
                .mw-collapsible-text {
                        // Same as the legend