From 41025be8f72d9fcbf644c7edc6126b5f64d4f9d7 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 15 Sep 2015 16:52:46 -0400 Subject: [PATCH 1/3] add download icon --- app/assets/javascripts/admin/templates/reports.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs index 5e1b406ea..718a61a2c 100644 --- a/app/assets/javascripts/admin/templates/reports.hbs +++ b/app/assets/javascripts/admin/templates/reports.hbs @@ -5,7 +5,7 @@ {{i18n 'admin.dashboard.reports.end_date'}} {{input type="date" value=endDate}} {{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="exportCsv" label="admin.export_csv.button_text"}} + {{d-button action="exportCsv" label="admin.export_csv.button_text" icon="download"}}
From 3c28eeaae3eff85091542bbf1828b3b79e7c0ee9 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 15 Sep 2015 16:54:38 -0400 Subject: [PATCH 2/3] FIX: Don't ESLINT addons --- .eslintignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.eslintignore b/.eslintignore index 1ecda0073..528b8358a 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,6 +7,7 @@ app/assets/javascripts/vendor.js app/assets/javascripts/locales/i18n.js app/assets/javascripts/defer/html-sanitizer-bundle.js app/assets/javascripts/discourse/lib/Markdown.Editor.js +app/assets/javascripts/ember-addons jsapp/lib/Markdown.Editor.js lib/javascripts/locale/ lib/javascripts/messageformat.js From 24991c40165866c5be7d43108ac442de585fefd8 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 15 Sep 2015 16:57:57 -0400 Subject: [PATCH 3/3] FIX: ESLint failure --- app/assets/javascripts/admin/controllers/admin-reports.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 index d83a031c6..d11e67305 100644 --- a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 @@ -40,7 +40,7 @@ export default Ember.Controller.extend({ name: this.get("model.type"), start_date: this.get('startDate'), 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); } }