Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 08:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: wrong qs param, allow string to be passed to util.getDaysArray

Browse Source
This commit is contained in:
Julian Lam
2021-02-23 14:10:46 -05:00
parent cc93822436
commit f8e1a74c26
4 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/admin/dashboard.js
View File

@@ -330,8 +330,6 @@ define('admin/dashboard', ['Chart', 'translator', 'benchpress'], function (Chart
} }
until = until.getTime(); until = until.getTime();
updateTrafficGraph($(this).attr('data-units'), until, amount); updateTrafficGraph($(this).attr('data-units'), until, amount);
$('[data-action="updateGraph"]').removeClass('active');
$(this).addClass('active');
require(['translator'], function (translator) { require(['translator'], function (translator) {
translator.translate('[[admin/dashboard:page-views-custom]]', function (translated) { translator.translate('[[admin/dashboard:page-views-custom]]', function (translated) {
@@ -373,8 +371,6 @@ define('admin/dashboard', ['Chart', 'translator', 'benchpress'], function (Chart
if (!formData.startRange && !formData.endRange) { if (!formData.startRange && !formData.endRange) {
// No range? Assume last 30 days // No range? Assume last 30 days
updateTrafficGraph('days'); updateTrafficGraph('days');
$('[data-action="updateGraph"]').removeClass('active');
$('[data-action="updateGraph"][data-units="days"]').addClass('active');
return; return;
} else if (!validRegexp.test(formData.startRange) || !validRegexp.test(formData.endRange)) { } else if (!validRegexp.test(formData.startRange) || !validRegexp.test(formData.endRange)) {
// Invalid Input // Invalid Input
@@ -388,8 +384,6 @@ define('admin/dashboard', ['Chart', 'translator', 'benchpress'], function (Chart
var amount = (until - new Date(formData.startRange).getTime()) / (1000 * 60 * 60 * 24); var amount = (until - new Date(formData.startRange).getTime()) / (1000 * 60 * 60 * 24);
updateTrafficGraph('days', until, amount); updateTrafficGraph('days', until, amount);
$('[data-action="updateGraph"]').removeClass('active');
targetEl.addClass('active');
// Update "custom range" label // Update "custom range" label
targetEl.attr('data-startRange', formData.startRange); targetEl.attr('data-startRange', formData.startRange);

8
public/src/admin/modules/dashboard-line-graph.js
View File

@@ -80,8 +80,6 @@ define('admin/modules/dashboard-line-graph', ['Chart', 'translator', 'benchpress
} }
until = until.getTime(); until = until.getTime();
Graph.update(set, $(this).attr('data-units'), until, amount); Graph.update(set, $(this).attr('data-units'), until, amount);
$('[data-action="updateGraph"]').removeClass('active');
$(this).addClass('active');
require(['translator'], function (translator) { require(['translator'], function (translator) {
translator.translate('[[admin/dashboard:page-views-custom]]', function (translated) { translator.translate('[[admin/dashboard:page-views-custom]]', function (translated) {
@@ -123,8 +121,6 @@ define('admin/modules/dashboard-line-graph', ['Chart', 'translator', 'benchpress
if (!formData.startRange && !formData.endRange) { if (!formData.startRange && !formData.endRange) {
// No range? Assume last 30 days // No range? Assume last 30 days
Graph.update(set, 'days'); Graph.update(set, 'days');
$('[data-action="updateGraph"]').removeClass('active');
$('[data-action="updateGraph"][data-units="days"]').addClass('active');
return; return;
} else if (!validRegexp.test(formData.startRange) || !validRegexp.test(formData.endRange)) { } else if (!validRegexp.test(formData.startRange) || !validRegexp.test(formData.endRange)) {
// Invalid Input // Invalid Input
@@ -138,8 +134,6 @@ define('admin/modules/dashboard-line-graph', ['Chart', 'translator', 'benchpress
var amount = (until - new Date(formData.startRange).getTime()) / (1000 * 60 * 60 * 24); var amount = (until - new Date(formData.startRange).getTime()) / (1000 * 60 * 60 * 24);
Graph.update(set, 'days', until, amount); Graph.update(set, 'days', until, amount);
$('[data-action="updateGraph"]').removeClass('active');
targetEl.addClass('active');
// Update "custom range" label // Update "custom range" label
targetEl.attr('data-startRange', formData.startRange); targetEl.attr('data-startRange', formData.startRange);
@@ -154,7 +148,7 @@ define('admin/modules/dashboard-line-graph', ['Chart', 'translator', 'benchpress
set, set,
units = ajaxify.data.query.units || 'hours', units = ajaxify.data.query.units || 'hours',
until = ajaxify.data.query.until, until = ajaxify.data.query.until,
amount = ajaxify.data.query.amount amount = ajaxify.data.query.count
) => { ) => {
if (!Graph._current) { if (!Graph._current) {
return; return;

2
public/src/utils.js
View File

@@ -595,7 +595,7 @@
}, },
getDaysArray: function (from, amount) { getDaysArray: function (from, amount) {
var currentDay = new Date(from || Date.now()).getTime(); var currentDay = new Date(parseInt(from, 10) || Date.now()).getTime();
var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
var labels = []; var labels = [];
var tmpDate; var tmpDate;

2
src/views/admin/partials/dashboard/graph.tpl
View File

@@ -22,7 +22,7 @@
</div> </div>
<div class="col-sm-3 hidden-xs text-center pageview-stats"> <div class="col-sm-3 hidden-xs text-center pageview-stats">
<div><strong id="pageViewsPastDay">{{{ if summary.day }}}{./summary.day}{{{ else }}}0{{{ end }}}</strong></div> <div><strong id="pageViewsPastDay">{{{ if summary.day }}}{./summary.day}{{{ else }}}0{{{ end }}}</strong></div>
<div><a href="#" class="updatePageviewsGraph active" data-action="updateGraph" data-units="hours">[[admin/dashboard:page-views-last-day]]</a></div> <div><a href="#" class="updatePageviewsGraph" data-action="updateGraph" data-units="hours" data-amount="24">[[admin/dashboard:page-views-last-day]]</a></div>
</div> </div>
<div class="col-sm-3 text-center pageview-stats"> <div class="col-sm-3 text-center pageview-stats">
<div><strong><i class="fa fa-clock-o"></i></strong></div> <div><strong><i class="fa fa-clock-o"></i></strong></div>