From ebdebf152dd7fb259c0ecf06ce2356c5b0143c08 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 4 Feb 2020 16:05:45 +0000 Subject: [PATCH] DEV: Use a string for category data-notification-level, not an integer This makes writing CSS to target specific notification levels more intuitive. Follow-up to 76409145523ac33f3f77bb9e8b7104c01aa35735 --- app/assets/javascripts/discourse/models/category.js.es6 | 8 ++++++++ .../discourse/templates/components/categories-boxes.hbs | 4 ++-- .../discourse/templates/components/categories-only.hbs | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/models/category.js.es6 b/app/assets/javascripts/discourse/models/category.js.es6 index 0e576a4b8f..faeaf1d926 100644 --- a/app/assets/javascripts/discourse/models/category.js.es6 +++ b/app/assets/javascripts/discourse/models/category.js.es6 @@ -85,6 +85,14 @@ const Category = RestModel.extend({ return notificationLevel === NotificationLevels.MUTED; }, + @discourseComputed("notification_level") + notificationLevelString(notificationLevel) { + // Get the key from the value + return Object.keys(NotificationLevels) + .find(key => NotificationLevels[key] === notificationLevel) + .toLowerCase(); + }, + @discourseComputed("name") url() { return Discourse.getURL(`/c/${Category.slugFor(this)}/${this.id}`); diff --git a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs index cd39c3751f..888eefce97 100644 --- a/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs +++ b/app/assets/javascripts/discourse/templates/components/categories-boxes.hbs @@ -1,5 +1,5 @@ {{#each categories as |c|}} -
{{#if c.isGrandParent}} {{#each c.subcategories as |subcategory|}} -
+
{{category-title-link tagName="h4" category=subcategory}} {{#if subcategory.subcategories}} diff --git a/app/assets/javascripts/discourse/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/templates/components/categories-only.hbs index d8280b5d73..ee0840bbe3 100644 --- a/app/assets/javascripts/discourse/templates/components/categories-only.hbs +++ b/app/assets/javascripts/discourse/templates/components/categories-only.hbs @@ -11,7 +11,7 @@ {{#each categories as |c|}} - + {{category-title-link category=c}} {{#if c.description_excerpt}} @@ -22,7 +22,7 @@ {{#if c.isGrandParent}} {{#each c.subcategories as |subcategory|}} - +
{{category-title-link tagName="h4" category=subcategory}} {{#if subcategory.description_excerpt}}