github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-03 05:39:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: add ability to show report data for all categories

Browse Source
This commit is contained in:
Neil Lalonde 2015-07-03 12:58:13 -04:00
parent 67135a472a
commit 06dc63fbae
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/admin/controllers/admin-reports.js.es6
View File

@ -7,16 +7,21 @@ export default Ember.ObjectController.extend({
categoryId: null, categoryId: null,
refreshing: false, refreshing: false,
categoryOptions: function() {
var arr = [{name: I18n.t('category.all'), value: 'all'}];
return arr.concat( Discourse.Site.currentProp('sortedCategories').map(function(i) { return {name: i.get('name'), value: i.get('id') }; }) );
}.property(),
actions: { actions: {
refreshReport() { refreshReport() {
var q;
this.set("refreshing", true); this.set("refreshing", true);
Discourse.Report.find( if (this.get('categoryId') === "all") {
this.get("type"), q = Discourse.Report.find(this.get("model.type"), this.get("startDate"), this.get("endDate"));
this.get("startDate"), } else {
this.get("endDate"), q = Discourse.Report.find(this.get("model.type"), this.get("startDate"), this.get("endDate"), this.get("categoryId"));
this.get("categoryId") }
).then(m => this.set("model", m) q.then(m => this.set("model", m)).finally(() => this.set("refreshing", false));
).finally(() => this.set("refreshing", false));
}, },
viewAsTable() { viewAsTable() {

2
app/assets/javascripts/admin/templates/reports.hbs
View File

@ -3,7 +3,7 @@
<div> <div>
{{i18n 'admin.dashboard.reports.start_date'}} {{input type="date" value=startDate}} {{i18n 'admin.dashboard.reports.start_date'}} {{input type="date" value=startDate}}
{{i18n 'admin.dashboard.reports.end_date'}} {{input type="date" value=endDate}} {{i18n 'admin.dashboard.reports.end_date'}} {{input type="date" value=endDate}}
{{category-chooser valueAttribute="id" value=categoryId source=categoryId}} {{combo-box valueAttribute="value" content=categoryOptions value=categoryId}}
{{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}} {{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}}
</div> </div>

1
config/locales/client.en.yml
View File

@ -1411,6 +1411,7 @@ en:
category: category:
can: 'can&hellip; ' can: 'can&hellip; '
none: '(no category)' none: '(no category)'
all: 'All categories'
choose: 'Select a category&hellip;' choose: 'Select a category&hellip;'
edit: 'edit' edit: 'edit'
edit_long: "Edit" edit_long: "Edit"