Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: treats users_(by_type|tl) as other reports (#6391)

This commit is contained in:
Joffrey JAFFEUX 2018-09-13 17:35:54 +02:00 committed by GitHub
parent 2ae7d3a118
commit 7bf8b0d305
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/admin/templates/dashboard_next_general.hbs
View File

@ -95,13 +95,11 @@
{{#conditional-loading-section isLoading=isLoading}}
{{admin-report
forcedModes="inline-table"
report=usersByTypeReport
lastRefreshedAt=lastRefreshedAt}}
dataSourceName="users_by_type"}}
{{admin-report
forcedModes="inline-table"
report=usersByTrustLevelReport
lastRefreshedAt=lastRefreshedAt}}
dataSourceName="users_by_trust_level"}}
{{/conditional-loading-section}}
</div>

2
app/assets/javascripts/discourse/lib/reports-loader.js.es6
View File

@ -5,7 +5,7 @@ let _queue = [];
let _processing = 0;
// max number of reports which will be requested in one bulk request
const MAX_JOB_SIZE = 5;
const MAX_JOB_SIZE = 4;
// max number of concurrent bulk requests
const MAX_CONCURRENCY = 3;

8
app/models/admin_dashboard_next_general_data.rb
View File

@ -1,14 +1,6 @@
class AdminDashboardNextGeneralData < AdminDashboardNextData
def reports
@reports ||= %w{
users_by_type
users_by_trust_level
}
end
def get_json
{
reports: self.class.reports(reports).compact,
updated_at: Time.zone.now.as_json
}
end