codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-28 01:56:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into signup-cta

Browse source 
Conflicts:
	.eslintignore
This commit is contained in:
Kane York 2015-09-15 13:59:36 -07:00
commit fc8539cb90
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/admin/controllers/admin-reports.js.es6
View file

@ -40,7 +40,7 @@ export default Ember.Controller.extend({
name: this.get("model.type"), name: this.get("model.type"),
start_date: this.get('startDate'), start_date: this.get('startDate'),
end_date: this.get('endDate'), end_date: this.get('endDate'),
category_id: this.get('categoryId') == 'all' ? undefined : this.get('categoryId') category_id: this.get('categoryId') === 'all' ? undefined : this.get('categoryId')
}).then(outputExportResult); }).then(outputExportResult);
} }
} }

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

@ -5,7 +5,7 @@
{{i18n 'admin.dashboard.reports.end_date'}} {{input type="date" value=endDate}} {{i18n 'admin.dashboard.reports.end_date'}} {{input type="date" value=endDate}}
{{combo-box valueAttribute="value" content=categoryOptions value=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"}}
{{d-button action="exportCsv" label="admin.export_csv.button_text"}} {{d-button action="exportCsv" label="admin.export_csv.button_text" icon="download"}}
</div> </div>
<div class='view-options'> <div class='view-options'>