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

FIX: duplicate categories and tags allowed in inputs where they shouldn't be allowed 

blocklist was renamed to blockedCategories/Tags
This commit is contained in:
Neil Lalonde 2020-08-24 17:37:04 -04:00
parent 52217099ed
commit ed30f49315
No known key found for this signature in database
GPG Key ID: FF871CA9037D0A91
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/app/templates/group/manage/categories.hbs
View File

@ -9,7 +9,7 @@
{{category-selector
categories=model.watchingCategories
blocklist=selectedCategories
blockedCategories=selectedCategories
onChange=(action (mut model.watchingCategories))
}}
@ -23,7 +23,7 @@
{{category-selector
categories=model.trackingCategories
blocklist=selectedCategories
blockedCategories=selectedCategories
onChange=(action (mut model.trackingCategories))
}}
@ -37,7 +37,7 @@
{{category-selector
categories=model.watchingFirstPostCategories
blocklist=selectedCategories
blockedCategories=selectedCategories
onChange=(action (mut model.watchingFirstPostCategories))
}}
@ -51,7 +51,7 @@
{{category-selector
categories=model.regularCategories
blocklist=selectedCategories
blockedCategories=selectedCategories
onChange=(action (mut model.regularCategories))
}}
@ -65,7 +65,7 @@
{{category-selector
categories=model.mutedCategories
blocklist=selectedCategories
blockedCategories=selectedCategories
onChange=(action (mut model.mutedCategories))
}}

10
app/assets/javascripts/discourse/app/templates/preferences/categories.hbs
View File

@ -8,7 +8,7 @@
{{/if}}
{{category-selector
categories=model.watchedCategories
blocklist=selectedCategories
blockedCategories=selectedCategories
onChange=(action (mut model.watchedCategories))
}}
</div>
@ -21,7 +21,7 @@
{{/if}}
{{category-selector
categories=model.trackedCategories
blocklist=selectedCategories
blockedCategories=selectedCategories
onChange=(action (mut model.trackedCategories))
}}
</div>
@ -31,7 +31,7 @@
<label>{{d-icon "d-watching-first"}} {{i18n "user.watched_first_post_categories"}}</label>
{{category-selector
categories=model.watchedFirstPostCategories
blocklist=selectedCategories
blockedCategories=selectedCategories
onChange=(action (mut model.watchedFirstPostCategories))
}}
</div>
@ -42,7 +42,7 @@
<label>{{d-icon "d-regular"}} {{i18n "user.regular_categories"}}</label>
{{category-selector
categories=model.regularCategories
blocklist=selectedCategories
blockedCategories=selectedCategories
onChange=(action (mut model.regularCategories))
}}
</div>
@ -55,7 +55,7 @@
{{/if}}
{{category-selector
categories=model.mutedCategories
blocklist=selectedCategories
blockedCategories=selectedCategories
onChange=(action (mut model.mutedCategories))
}}
</div>

8
app/assets/javascripts/discourse/app/templates/preferences/tags.hbs
View File

@ -6,7 +6,7 @@
<label>{{d-icon "d-watching" class="icon watching"}} {{i18n "user.watched_tags"}}</label>
{{tag-chooser
tags=model.watched_tags
blocklist=selectedTags
blockedTags=selectedTags
allowCreate=false
everyTag=true
unlimitedTagCount=true
@ -19,7 +19,7 @@
<label>{{d-icon "d-tracking" class="icon tracking"}} {{i18n "user.tracked_tags"}}</label>
{{tag-chooser
tags=model.tracked_tags
blocklist=selectedTags
blockedTags=selectedTags
allowCreate=false
everyTag=true
unlimitedTagCount=true}}
@ -31,7 +31,7 @@
<label>{{d-icon "d-watching-first" class="icon watching-first-post"}} {{i18n "user.watched_first_post_tags"}}</label>
{{tag-chooser
tags=model.watching_first_post_tags
blocklist=selectedTags
blockedTags=selectedTags
allowCreate=false
everyTag=true
unlimitedTagCount=true}}
@ -45,7 +45,7 @@
<label>{{d-icon "d-muted" class="icon muted"}} {{i18n "user.muted_tags"}}</label>
{{tag-chooser
tags=model.muted_tags
blocklist=selectedTags
blockedTags=selectedTags
allowCreate=false
everyTag=true
unlimitedTagCount=true}}