This commit is contained in:
Isaac Janzen 2023-04-26 14:31:48 -05:00
parent 61f6e63191
commit cf41d5916f
No known key found for this signature in database
GPG Key ID: D75AF9C21FD8EBCD
12 changed files with 108 additions and 20 deletions

View File

@ -1,10 +1,15 @@
<div class="reviewable-filter discourse-assign-assign-to-filter">
<label class="filter-label">{{i18n "discourse_assign.assigned_to"}}</label>
<EmailGroupUserChooser @value={{additionalFilters.assigned_to}} @onChange={{action "updateAssignedTo"}} @autocomplete="off" @options={{hash
<EmailGroupUserChooser
@value={{additionalFilters.assigned_to}}
@onChange={{action "updateAssignedTo"}}
@autocomplete="off"
@options={{hash
maximum=1
fullWidthWrap=true
filterPlaceholder=placeholderKey
includeGroups=false
groupMembersOf=allowedGroups
}} />
}}
/>
</div>

View File

@ -3,11 +3,15 @@
"search.advanced.assigned.label"
}}</label>
<div class="controls">
<EmailGroupUserChooser @value={{searchedTerms.assigned}} @onChange={{action "onChangeAssigned"}} @options={{hash
<EmailGroupUserChooser
@value={{searchedTerms.assigned}}
@onChange={{action "onChangeAssigned"}}
@options={{hash
maximum=1
excludeCurrentUser=false
includeGroups=true
customSearchOptions=(hash assignableGroups=true)
}} />
}}
/>
</div>
</div>

View File

@ -2,7 +2,11 @@
<section class="field">
<div class="enable-accepted-answer">
<label class="checkbox-label">
<Input @type="checkbox" @checked={{readonly category.enable_unassigned_filter}} @change={{action "onChangeSetting" value="target.checked"}} />
<Input
@type="checkbox"
@checked={{readonly category.enable_unassigned_filter}}
@change={{action "onChangeSetting" value="target.checked"}}
/>
{{i18n "discourse_assign.add_unassigned_filter"}}
</label>
</div>

View File

@ -6,5 +6,12 @@
"discourse_assign.admin.groups.manage.interaction.assignable_levels.title"
}}</label>
<ComboBox @name="alias" @valueProperty="value" @value={{assignableLevel}} @content={{assignableLevelOptions}} @class="groups-form-assignable-level" @onChange={{action (mut model.assignable_level)}} />
<ComboBox
@name="alias"
@valueProperty="value"
@value={{assignableLevel}}
@content={{assignableLevelOptions}}
@class="groups-form-assignable-level"
@onChange={{action (mut model.assignable_level)}}
/>
</div>

View File

@ -2,7 +2,11 @@
{{#if hasIncoming}}
<div class="show-mores">
<a href class="alert alert-info clickable" {{action showInserted}}>
<CountI18n @key="topic_count_" @suffix="latest" @count={{incomingCount}} />
<CountI18n
@key="topic_count_"
@suffix="latest"
@count={{incomingCount}}
/>
</a>
</div>
{{/if}}

View File

@ -1,5 +1,9 @@
{{#if showAvatar}}
<LinkTo @route="group.assigned.show" @model={{filter.username_lower}} @query={{hash order=order ascending=ascending search=search}}>
<LinkTo
@route="group.assigned.show"
@model={{filter.username_lower}}
@query={{hash order=order ascending=ascending search=search}}
>
<div class="assign-image">
<a href={{filter.userPath}} data-user-card={{filter.username}}>{{avatar
filter
@ -17,7 +21,11 @@
</div>
</LinkTo>
{{else if groupName}}
<LinkTo @route="group.assigned.show" @model={{filter}} @query={{hash order=order ascending=ascending search=search}}>
<LinkTo
@route="group.assigned.show"
@model={{filter}}
@query={{hash order=order ascending=ascending search=search}}
>
<div class="assign-image">
{{d-icon "group-plus"}}
</div>
@ -30,7 +38,11 @@
</div>
</LinkTo>
{{else}}
<LinkTo @route="group.assigned.show" @model={{filter}} @query={{hash order=order ascending=ascending search=search}}>
<LinkTo
@route="group.assigned.show"
@model={{filter}}
@query={{hash order=order ascending=ascending search=search}}
>
<div class="assign-everyone">
{{i18n "discourse_assign.group_everyone"}}
</div>

View File

@ -1,6 +1,12 @@
{{#if siteSettings.assign_enabled}}
<div class="controls controls-dropdown">
<label>{{i18n "discourse_assign.reminders_frequency.description"}}</label>
<ComboBox @id="remind-assigns-frequency" @valueProperty="value" @content={{availableFrequencies}} @value={{selectedFrequency}} @onChange={{action (mut user.custom_fields.remind_assigns_frequency)}} />
<ComboBox
@id="remind-assigns-frequency"
@valueProperty="value"
@content={{availableFrequencies}}
@value={{selectedFrequency}}
@onChange={{action (mut user.custom_fields.remind_assigns_frequency)}}
/>
</div>
{{/if}}

View File

@ -1,9 +1,20 @@
<div class="topic-search-div">
<div class="inline-form full-width">
<Input class="no-blur" @value={{readonly search}} placeholder={{i18n "discourse_assign.topic_search_placeholder"}} @input={{action "onChangeFilter" value="target.value"}} @autocomplete="off" @type="search" />
<Input
class="no-blur"
@value={{readonly search}}
placeholder={{i18n "discourse_assign.topic_search_placeholder"}}
@input={{action "onChangeFilter" value="target.value"}}
@autocomplete="off"
@type="search"
/>
</div>
</div>
<LoadMore @class="paginated-topics-list" @selector=".paginated-topics-list .topic-list tr" @action={{action "loadMore"}}>
<LoadMore
@class="paginated-topics-list"
@selector=".paginated-topics-list .topic-list tr"
@action={{action "loadMore"}}
>
{{basic-assigned-topic-list
topicList=model

View File

@ -1,8 +1,19 @@
<section class="user-secondary-navigation group-assignments">
<MobileNav @class="activity-nav" @desktopClass="action-list activity-list nav-stacked">
<MobileNav
@class="activity-nav"
@desktopClass="action-list activity-list nav-stacked"
>
{{#if isDesktop}}
<div class="search-div">
<Input @type="text" placeholder={{i18n "discourse_assign.sidebar_name_filter_placeholder"}} @value={{readonly filterName}} class="search" @input={{action "onChangeFilterName" value="target.value"}} />
<Input
@type="text"
placeholder={{i18n
"discourse_assign.sidebar_name_filter_placeholder"
}}
@value={{readonly filterName}}
class="search"
@input={{action "onChangeFilterName" value="target.value"}}
/>
</div>
{{/if}}
<LoadMore @selector=".activity-nav li" @action={{action "loadMore"}}>

View File

@ -2,7 +2,11 @@
{{#if hasIncoming}}
<div class="show-mores">
<a href class="alert alert-info clickable" {{action showInserted}}>
<CountI18n @key="topic_count_" @suffix="latest" @count={{incomingCount}} />
<CountI18n
@key="topic_count_"
@suffix="latest"
@count={{incomingCount}}
/>
</a>
</div>
{{/if}}

View File

@ -34,7 +34,12 @@
{{#if this.statusEnabled}}
<div class="control-group assign-status">
<label>{{i18n "discourse_assign.assign_modal.status_label"}}</label>
<ComboBox @id="assign-status" @content={{availableStatuses}} @value={{status}} @onChange={{action (mut model.status)}} />
<ComboBox
@id="assign-status"
@content={{availableStatuses}}
@value={{status}}
@onChange={{action (mut model.status)}}
/>
</div>
{{/if}}
@ -44,7 +49,11 @@
class="label-optional"
>{{i18n "discourse_assign.assign_modal.optional_label"}}</span>
</label>
<Textarea @id="assign-modal-note" @value={{model.note}} @key-down={{action "handleTextAreaKeydown"}} />
<Textarea
@id="assign-modal-note"
@value={{model.note}}
@key-down={{action "handleTextAreaKeydown"}}
/>
</div>
</div>
</DModalBody>

View File

@ -6,11 +6,22 @@
{{else}}
<div class="topic-search-div">
<div class="inline-form full-width">
<Input class="no-blur" @value={{readonly search}} placeholder={{i18n "discourse_assign.topic_search_placeholder"}} @input={{action "onChangeFilter" value="target.value"}} @autocomplete="off" @type="search" />
<Input
class="no-blur"
@value={{readonly search}}
placeholder={{i18n "discourse_assign.topic_search_placeholder"}}
@input={{action "onChangeFilter" value="target.value"}}
@autocomplete="off"
@type="search"
/>
</div>
</div>
<LoadMore @class="paginated-topics-list" @selector=".paginated-topics-list .topic-list tr" @action={{action "loadMore"}}>
<LoadMore
@class="paginated-topics-list"
@selector=".paginated-topics-list .topic-list tr"
@action={{action "loadMore"}}
>
{{basic-assigned-topic-list
topicList=model
hideCategory=hideCategory