IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: move min tag setting to tags section in edit category (#19789)

Browse Source 
`Minimum number of tags required in a topic` should be in `Tags` panel instead of `Settings`
This commit is contained in:
Krzysztof Kotlarek 2023-01-20 13:30:39 +11:00 committed by GitHub
parent f409e977a9
commit b05f193cf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
View File

@ -181,20 +181,6 @@
</div> </div>
</section> </section>
{{#if this.siteSettings.tagging_enabled}}
<section class="field minimum-required-tags">
<label for="category-minimum-tags">
{{i18n "category.minimum_required_tags"}}
</label>
<TextField
@value={{this.category.minimum_required_tags}}
@id="category-minimum-tags"
@type="number"
@min="0"
/>
</section>
{{/if}}
<section class="field num-auto-bump-daily"> <section class="field num-auto-bump-daily">
<label for="category-number-daily-bump"> <label for="category-number-daily-bump">
{{i18n "category.num_auto_bump_daily"}} {{i18n "category.num_auto_bump_daily"}}
@ -378,4 +364,4 @@
@name="category-custom-settings" @name="category-custom-settings"
@args={{hash category=this.category}} @args={{hash category=this.category}}
@tagName="section" @tagName="section"
/> />

13
app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
View File

@ -1,3 +1,14 @@
<section class="field minimum-required-tags">
<label for="category-minimum-tags">
{{i18n "category.minimum_required_tags"}}
</label>
<TextField
@value={{this.category.minimum_required_tags}}
@id="category-minimum-tags"
@type="number"
@min="0"
/>
</section>
<section class="field allowed-tags"> <section class="field allowed-tags">
<label>{{i18n "category.tags_allowed_tags"}}</label> <label>{{i18n "category.tags_allowed_tags"}}</label>
<TagChooser <TagChooser
@ -71,4 +82,4 @@
@class="add-required-tag-group" @class="add-required-tag-group"
/> />
</section> </section>
</section> </section>

2
app/assets/javascripts/discourse/tests/acceptance/category-edit-test.js
View File

@ -77,6 +77,8 @@ acceptance("Category Edit", function (needs) {
test("Editing required tag groups", async function (assert) { test("Editing required tag groups", async function (assert) {
await visit("/c/bug/edit/tags"); await visit("/c/bug/edit/tags");
assert.ok(exists(".minimum-required-tags"));
assert.ok(exists(".required-tag-groups")); assert.ok(exists(".required-tag-groups"));
assert.strictEqual(count(".required-tag-group-row"), 0); assert.strictEqual(count(".required-tag-group-row"), 0);

3
app/assets/stylesheets/common/base/edit-category.scss
View File

@ -102,7 +102,8 @@ div.edit-category {
} }
} }
.edit-category-tab-settings { .edit-category-tab-settings,
.edit-category-tab-tags {
> section { > section {
margin-bottom: 1.5em; margin-bottom: 1.5em;
} }