Pwirth has uploaded a new change for review.
https://gerrit.wikimedia.org/r/169726
Change subject: ExtendedStatistics: Small fixes
......................................................................
ExtendedStatistics: Small fixes
* Fixed typo
* Fixed time labels
* Set the default value of MaxNumberOfIntervals to 366
Change-Id: I863eb9c3e7e0db24f5b2101b0e35748738eb1e92
---
M Statistics/Statistics.class.php
M Statistics/Statistics.setup.php
M Statistics/includes/specials/SpecialExtendedStatistics.class.php
M Statistics/resources/BS.Statistics/Chart.js
M Statistics/resources/BS.Statistics/Filter.js
M Statistics/resources/BS.Statistics/Panel.js
M Statistics/resources/BS.Statistics/StatisticsPortlet.js
M Statistics/resources/BS.Statistics/StatisticsPortletConfig.js
M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfArticles.js
M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfEdits.js
M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfPages.js
M Statistics/resources/BS.Statistics/StatisticsPortletNumberOfUsers.js
M Statistics/resources/bluespice.statistics.js
13 files changed, 30 insertions(+), 19 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/26/169726/1
diff --git a/Statistics/Statistics.class.php b/Statistics/Statistics.class.php
index 1d73116..676e7de 100644
--- a/Statistics/Statistics.class.php
+++ b/Statistics/Statistics.class.php
@@ -102,7 +102,7 @@
$this->setHook( 'BSDashboardsUserDashboardPortalPortlets' );
BsConfig::registerVar( 'MW::Statistics::ExcludeUsers', array(
'WikiSysop' ), BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_STRING,
'bs-statistics-pref-excludeusers', 'multiselectplusadd' );
- BsConfig::registerVar( 'MW::Statistics::MaxNumberOfIntervals',
36, BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT,
'bs-statistics-pref-maxnumberofintervals', 'int' );
+ BsConfig::registerVar( 'MW::Statistics::MaxNumberOfIntervals',
366, BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT,
'bs-statistics-pref-maxnumberofintervals', 'int' );
$aAvailableGrains = array(
'Y' => 'bs-statistics-year',
diff --git a/Statistics/Statistics.setup.php b/Statistics/Statistics.setup.php
index afbeec2..fb24cb8 100644
--- a/Statistics/Statistics.setup.php
+++ b/Statistics/Statistics.setup.php
@@ -38,7 +38,8 @@
'bs-statistics-month',
'bs-statistics-week',
'bs-statistics-day',
- 'bs-statistics-label-count'
+ 'bs-statistics-label-count',
+ 'bs-statistics-label-time',
)
) + $aResourceModuleTemplate;
@@ -52,6 +53,7 @@
'bs-statistics-portletconfig-periodday',
'bs-statistics-week',
'bs-statistics-month',
+ 'bs-statistics-label-time',
)
) + $aResourceModuleTemplate;
diff --git a/Statistics/includes/specials/SpecialExtendedStatistics.class.php
b/Statistics/includes/specials/SpecialExtendedStatistics.class.php
index 933fec6..c573408 100644
--- a/Statistics/includes/specials/SpecialExtendedStatistics.class.php
+++ b/Statistics/includes/specials/SpecialExtendedStatistics.class.php
@@ -192,7 +192,14 @@
);
$i ++;
}
- $aResult['label'] = wfMessage(
'bs-statistics-'.$oDiagram->getActualGrain() )->plain();
+
+ $aAvalableGrains = BsConfig::get(
'MW::Statistics::AvailableGrains' );
+ $sLabelMsgKey = 'bs-statistics-label-time';
+ if( isset($aAvalableGrains[$oDiagram->getActualGrain()]) ) {
+ $sLabelMsgKey =
$aAvalableGrains[$oDiagram->getActualGrain()];
+ }
+
+ $aResult['label'] = wfMessage( $sLabelMsgKey )->plain();
$aResult['success'] = true;
return json_encode($aResult);
diff --git a/Statistics/resources/BS.Statistics/Chart.js
b/Statistics/resources/BS.Statistics/Chart.js
index 5eadd25..2eaa8de 100644
--- a/Statistics/resources/BS.Statistics/Chart.js
+++ b/Statistics/resources/BS.Statistics/Chart.js
@@ -4,7 +4,7 @@
* Part of BlueSpice for MediaWiki
*
* @author Patric Wirth <[email protected]>
- * @package Bluespice_Extensions
+ * @package BlueSpice_Extensions
* @subpackage Statistics
* @copyright Copyright (C) 2013 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
@@ -49,7 +49,7 @@
type: 'Category',
position: 'bottom',
fields: ['name'],
- title: 'Bluespice'
+ title: 'BlueSpice'
});
this.series.push({
diff --git a/Statistics/resources/BS.Statistics/Filter.js
b/Statistics/resources/BS.Statistics/Filter.js
index 1f8c3b1..ba83376 100644
--- a/Statistics/resources/BS.Statistics/Filter.js
+++ b/Statistics/resources/BS.Statistics/Filter.js
@@ -4,7 +4,7 @@
* Part of BlueSpice for MediaWiki
*
* @author Patric Wirth <[email protected]>
- * @package Bluespice_Extensions
+ * @package BlueSpice_Extensions
* @subpackage Statistics
* @copyright Copyright (C) 2013 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
diff --git a/Statistics/resources/BS.Statistics/Panel.js
b/Statistics/resources/BS.Statistics/Panel.js
index 12e16b4..8c6897e 100644
--- a/Statistics/resources/BS.Statistics/Panel.js
+++ b/Statistics/resources/BS.Statistics/Panel.js
@@ -4,7 +4,7 @@
* Part of BlueSpice for MediaWiki
*
* @author Patric Wirth <[email protected]>
- * @package Bluespice_Extensions
+ * @package BlueSpice_Extensions
* @subpackage Statistics
* @copyright Copyright (C) 2013 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
@@ -95,6 +95,8 @@
},
onPnlFiltersSaved: function(sender, data, result) {
this.getEl().unmask();
+ //Quickfix: Sometimes label was not set
+ this.crtMain.setCategory(result.label);
if( typeof data.list == 'undefined' ) {
this.muExport.enable();
this.pnlStats.hide();
diff --git a/Statistics/resources/BS.Statistics/StatisticsPortlet.js
b/Statistics/resources/BS.Statistics/StatisticsPortlet.js
index e7a2fee..446ae42 100644
--- a/Statistics/resources/BS.Statistics/StatisticsPortlet.js
+++ b/Statistics/resources/BS.Statistics/StatisticsPortlet.js
@@ -4,7 +4,7 @@
* Part of BlueSpice for MediaWiki
*
* @author Patric Wirth <[email protected]>
- * @package Bluespice_Extensions
+ * @package BlueSpice_Extensions
* @subpackage Statistics
* @copyright Copyright (C) 2013 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
@@ -17,7 +17,7 @@
axes: [],
series:[],
portletConfigClass : 'BS.Statistics.StatisticsPortletConfig',
- categoryLabel: 'Bluespice',
+ categoryLabel: 'BlueSpice',
filters: [],
beforeInitCompontent: function() {
diff --git a/Statistics/resources/BS.Statistics/StatisticsPortletConfig.js
b/Statistics/resources/BS.Statistics/StatisticsPortletConfig.js
index 26bca46..6e4a173 100644
--- a/Statistics/resources/BS.Statistics/StatisticsPortletConfig.js
+++ b/Statistics/resources/BS.Statistics/StatisticsPortletConfig.js
@@ -4,7 +4,7 @@
* Part of BlueSpice for MediaWiki
*
* @author Patric Wirth <[email protected]>
- * @package Bluespice_Extensions
+ * @package BlueSpice_Extensions
* @subpackage Statistics
* @copyright Copyright (C) 2013 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
diff --git
a/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfArticles.js
b/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfArticles.js
index fd46d7f..2dc2bdb 100644
--- a/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfArticles.js
+++ b/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfArticles.js
@@ -4,7 +4,7 @@
* Part of BlueSpice for MediaWiki
*
* @author Patric Wirth <[email protected]>
- * @package Bluespice_Extensions
+ * @package BlueSpice_Extensions
* @subpackage Statistics
* @copyright Copyright (C) 2013 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
@@ -14,7 +14,7 @@
Ext.define('BS.Statistics.StatisticsPortletNumberOfArticles', {
extend: 'BS.Statistics.StatisticsPortlet',
portletConfigClass : 'BS.Statistics.StatisticsPortletConfig',
- categoryLabel: 'Bluespice',
+ categoryLabel: 'BlueSpice',
beforeInitCompontent: function() {
this.ctMainConfig = {
axes: [],
diff --git
a/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfEdits.js
b/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfEdits.js
index 9b9e7f1..91a0482 100644
--- a/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfEdits.js
+++ b/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfEdits.js
@@ -4,7 +4,7 @@
* Part of BlueSpice for MediaWiki
*
* @author Patric Wirth <[email protected]>
- * @package Bluespice_Extensions
+ * @package BlueSpice_Extensions
* @subpackage Statistics
* @copyright Copyright (C) 2013 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
@@ -14,7 +14,7 @@
Ext.define('BS.Statistics.StatisticsPortletNumberOfEdits', {
extend: 'BS.Statistics.StatisticsPortlet',
portletConfigClass : 'BS.Statistics.StatisticsPortletConfig',
- categoryLabel: 'Bluespice',
+ categoryLabel: 'BlueSpice',
beforeInitCompontent: function() {
this.ctMainConfig = {
axes: [],
diff --git
a/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfPages.js
b/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfPages.js
index 18d643b..2a0a9e2 100644
--- a/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfPages.js
+++ b/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfPages.js
@@ -4,7 +4,7 @@
* Part of BlueSpice for MediaWiki
*
* @author Patric Wirth <[email protected]>
- * @package Bluespice_Extensions
+ * @package BlueSpice_Extensions
* @subpackage Statistics
* @copyright Copyright (C) 2013 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
@@ -14,7 +14,7 @@
Ext.define('BS.Statistics.StatisticsPortletNumberOfPages', {
extend: 'BS.Statistics.StatisticsPortlet',
portletConfigClass : 'BS.Statistics.StatisticsPortletConfig',
- categoryLabel: 'Bluespice',
+ categoryLabel: 'BlueSpice',
beforeInitCompontent: function() {
this.ctMainConfig = {
axes: [],
diff --git
a/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfUsers.js
b/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfUsers.js
index af2fa8e..c4e73aa 100644
--- a/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfUsers.js
+++ b/Statistics/resources/BS.Statistics/StatisticsPortletNumberOfUsers.js
@@ -4,7 +4,7 @@
* Part of BlueSpice for MediaWiki
*
* @author Patric Wirth <[email protected]>
- * @package Bluespice_Extensions
+ * @package BlueSpice_Extensions
* @subpackage Statistics
* @copyright Copyright (C) 2013 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
@@ -14,7 +14,7 @@
Ext.define('BS.Statistics.StatisticsPortletNumberOfUsers', {
extend: 'BS.Statistics.StatisticsPortlet',
portletConfigClass : 'BS.Statistics.StatisticsPortletConfig',
- categoryLabel: 'Bluespice',
+ categoryLabel: 'BlueSpice',
filters: ['UserFilter'],
beforeInitCompontent: function() {
this.ctMainConfig = {
diff --git a/Statistics/resources/bluespice.statistics.js
b/Statistics/resources/bluespice.statistics.js
index edad6b1..b2df744 100644
--- a/Statistics/resources/bluespice.statistics.js
+++ b/Statistics/resources/bluespice.statistics.js
@@ -3,7 +3,7 @@
*
* @author Markus Glaser <[email protected]>
* @author Patric Wirth <[email protected]>
- * @package Bluespice_Extensions
+ * @package BlueSpice_Extensions
* @subpackage Statistics
* @copyright Copyright (C) 2011 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
--
To view, visit https://gerrit.wikimedia.org/r/169726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I863eb9c3e7e0db24f5b2101b0e35748738eb1e92
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pwirth <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
