From: Moriel Schottlender <moriel@gmail.com>
Date: Tue, 27 Jun 2017 00:25:14 +0000 (-0700)
Subject: RCFilters: Correct default view title
X-Git-Tag: 1.31.0-rc.0~2882^2
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=e7a5449ef9d1faccc6f380f9dee493f8d01ee6d9;p=lhc%2Fweb%2Fwiklou.git

RCFilters: Correct default view title

The key was changed from "label" to "title" but that was not changed
in the default view. Change the definition key and adjust the name
of the method so it isn't confusing.

Bug: T168855
Change-Id: Ib94f57d3bcce94a02fac25d66b893a68aa648e84
---

diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index 37cf4ddf05..82cc8932d0 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -326,7 +326,7 @@
 		// Collect views
 		allViews = {
 			'default': {
-				label: mw.msg( 'rcfilters-filterlist-title' ),
+				title: mw.msg( 'rcfilters-filterlist-title' ),
 				groups: filterGroups
 			}
 		};
@@ -907,10 +907,13 @@
 	/**
 	 * Get the label for the current view
 	 *
+	 * @param {string} viewName View name
 	 * @return {string} Label for the current view
 	 */
-	mw.rcfilters.dm.FiltersViewModel.prototype.getCurrentViewLabel = function () {
-		return this.views[ this.getCurrentView() ].title;
+	mw.rcfilters.dm.FiltersViewModel.prototype.getViewTitle = function ( viewName ) {
+		viewName = viewName || this.getCurrentView();
+
+		return this.views[ viewName ] && this.views[ viewName ].title;
 	};
 
 	/**
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
index fe9148903c..01388848c9 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
@@ -106,7 +106,7 @@
 	mw.rcfilters.ui.FilterMenuHeaderWidget.prototype.onModelUpdate = function () {
 		var currentView = this.model.getCurrentView();
 
-		this.setLabel( this.model.getCurrentViewLabel() );
+		this.setLabel( this.model.getViewTitle( currentView ) );
 
 		this.invertNamespacesButton.toggle( currentView === 'namespaces' );
 		this.backButton.toggle( currentView !== 'default' );