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

FIX: category settings for calendar were incorrect (#631) 

Following the key change in d31933bf49 this has been broken.

This commit also hides the section if `sort_categories_by_event_start_date_enabled` AND `disable_resorting_on_categories_enabled` are not enabled, prior to this change we would just show the title, with no checkbox to check.
This commit is contained in:
Joffrey JAFFEUX 2024-10-24 16:13:51 +09:00 committed by GitHub
parent 52ebb592d2
commit b7858ef7cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
assets/javascripts/discourse/adapters/connectors/category-custom-settings/show-event-category-sorting-settings.hbs
View File

@ -1,27 +1,38 @@
<section>
<h3>{{i18n "category.settings_sections.event_sorting"}}</h3>
{{#if
(or
siteSettings.sort_categories_by_event_start_date_enabled
siteSettings.disable_resorting_on_categories_enabled
)
}}
<section>
<h3>{{i18n
"discourse_post_event.category.settings_sections.event_sorting"
}}</h3>
{{#if siteSettings.sort_categories_by_event_start_date_enabled}}
<section class="field show-subcategory-list-field">
<label>
<Input
@type="checkbox"
@checked={{this.category.custom_fields.sort_topics_by_event_start_date}}
/>
{{i18n "category.sort_topics_by_event_start_date"}}
</label>
</section>
{{/if}}
{{#if siteSettings.sort_categories_by_event_start_date_enabled}}
<section class="field show-subcategory-list-field">
<label>
<Input
@type="checkbox"
@checked={{this.category.custom_fields.sort_topics_by_event_start_date}}
/>
{{i18n
"discourse_post_event.category.sort_topics_by_event_start_date"
}}
</label>
</section>
{{/if}}
{{#if siteSettings.disable_resorting_on_categories_enabled}}
<section class="field show-subcategory-list-field">
<label>
<Input
@type="checkbox"
@checked={{this.category.custom_fields.disable_topic_resorting}}
/>
{{i18n "category.disable_topic_resorting"}}
</label>
</section>
{{/if}}
</section>
{{#if siteSettings.disable_resorting_on_categories_enabled}}
<section class="field show-subcategory-list-field">
<label>
<Input
@type="checkbox"
@checked={{this.category.custom_fields.disable_topic_resorting}}
/>
{{i18n "discourse_post_event.category.disable_topic_resorting"}}
</label>
</section>
{{/if}}
</section>
{{/if}}