This repository was archived by the owner on Jul 14, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 11 files changed +446
-1144
lines changed
assets/javascripts/discourse
advanced-search-options-below
test/javascripts/integration/components Expand file tree Collapse file tree 11 files changed +446
-1144
lines changed Original file line number Diff line number Diff line change @@ -97,4 +97,4 @@ DEPENDENCIES
97
97
syntax_tree
98
98
99
99
BUNDLED WITH
100
- 2.6.5
100
+ 2.6.6
Original file line number Diff line number Diff line change 1
1
<div class =" reviewable-filter discourse-assign-assign-to-filter" >
2
2
<label class =" filter-label" >{{ i18n " discourse_assign.assigned_to" }} </label >
3
+
3
4
<EmailGroupUserChooser
4
- autocomplete =" off"
5
- @value ={{ this.additionalFilters.assigned_to }}
5
+ @value ={{ this.outletArgs.additionalFilters.assigned_to }}
6
6
@onChange ={{ this.updateAssignedTo }}
7
7
@options ={{ hash
8
8
maximum =1
9
9
fullWidthWrap =true
10
10
includeGroups =false
11
11
groupMembersOf =this.allowedGroups
12
12
}}
13
+ autocomplete =" off"
13
14
/>
14
15
</div >
Original file line number Diff line number Diff line change
1
+ import Component from "@ember/component" ;
1
2
import { action } from "@ember/object" ;
3
+ import { service } from "@ember/service" ;
4
+ import { classNames } from "@ember-decorators/component" ;
2
5
3
- export default {
4
- @action
5
- updateAssignedTo ( selected ) {
6
- this . set ( "additionalFilters.assigned_to" , selected . firstObject ) ;
7
- } ,
8
-
9
- shouldRender ( args ) {
6
+ @classNames ( "assigned-to-filter" )
7
+ export default class AssignedToFilter extends Component {
8
+ static shouldRender ( args ) {
10
9
return args . additionalFilters ;
11
- } ,
10
+ }
11
+
12
+ @service site ;
13
+ @service siteSettings ;
12
14
13
- setupComponent ( args , component ) {
14
- const groupIDs = ( component . siteSettings . assign_allowed_on_groups || "" )
15
- . split ( "|" )
16
- . filter ( Boolean ) ;
17
- const groupNames = this . site . groups
18
- . filter ( ( group ) => groupIDs . includes ( group . id . toString ( ) ) )
19
- . mapBy ( "name" ) ;
20
- component . set ( "allowedGroups" , groupNames ) ;
21
- } ,
22
- } ;
15
+ groupIDs = ( this . siteSettings . assign_allowed_on_groups || "" )
16
+ . split ( "|" )
17
+ . filter ( Boolean ) ;
18
+ allowedGroups = this . site . groups
19
+ . filter ( ( group ) => this . groupIDs . includes ( group . id . toString ( ) ) )
20
+ . mapBy ( "name" ) ;
21
+
22
+ @action
23
+ updateAssignedTo ( selected ) {
24
+ this . set ( "outletArgs.additionalFilters.assigned_to" , selected . firstObject ) ;
25
+ }
26
+ }
Original file line number Diff line number Diff line change 1
1
<div class =" control-group" >
2
- <label class =" control-label" for =" search-assigned-to" >{{ i18n
3
- " search.advanced.assigned.label"
4
- }} </label >
2
+ <label class =" control-label" for =" search-assigned-to" >
3
+ {{ i18n " search.advanced.assigned.label" }}
4
+ </label >
5
+
5
6
<div class =" controls" >
6
7
<EmailGroupUserChooser
7
- @value ={{ this.searchedTerms.assigned }}
8
- @onChange ={{ action " onChangeAssigned" }}
8
+ @value ={{ this.outletArgs. searchedTerms.assigned }}
9
+ @onChange ={{ this. onChangeAssigned}}
9
10
@options ={{ hash
10
11
maximum =1
11
12
excludeCurrentUser =false
Original file line number Diff line number Diff line change
1
+ import Component from "@ember/component" ;
1
2
import { action } from "@ember/object" ;
3
+ import { service } from "@ember/service" ;
4
+ import { classNames } from "@ember-decorators/component" ;
2
5
3
- export default {
4
- shouldRender ( args , component ) {
6
+ @classNames ( "assigned-advanced-search" )
7
+ export default class AssignedAdvancedSearch extends Component {
8
+ static shouldRender ( args , component ) {
5
9
return component . currentUser ?. can_assign ;
6
- } ,
10
+ }
11
+
12
+ @service currentUser ;
7
13
8
14
@action
9
15
onChangeAssigned ( value ) {
10
- this . onChangeSearchedTermField (
16
+ this . outletArgs . onChangeSearchedTermField (
11
17
"assigned" ,
12
18
"updateSearchTermForAssignedUsername" ,
13
19
value
14
20
) ;
15
- } ,
16
- } ;
21
+ }
22
+ }
Original file line number Diff line number Diff line change 1
1
<h3 >{{ i18n " discourse_assign.assign.title" }} </h3 >
2
+
2
3
<section class =" field" >
3
4
<div class =" enable-accepted-answer" >
4
5
<label class =" checkbox-label" >
5
6
<Input
6
7
@type =" checkbox"
7
- @checked ={{ readonly this.category.enable_unassigned_filter }}
8
- {{ on " change" ( action " onChangeSetting " value = " target.checked " ) }}
8
+ @checked ={{ readonly this.outletArgs. category.enable_unassigned_filter }}
9
+ {{ on " change" this.onChangeSetting }}
9
10
/>
10
11
{{ i18n " discourse_assign.add_unassigned_filter" }}
11
12
</label >
Original file line number Diff line number Diff line change
1
+ import Component from "@ember/component" ;
1
2
import { action } from "@ember/object" ;
3
+ import { classNames } from "@ember-decorators/component" ;
2
4
3
- export default {
5
+ @classNames ( "assign-settings" )
6
+ export default class AssignSettings extends Component {
4
7
@action
5
- onChangeSetting ( value ) {
8
+ onChangeSetting ( event ) {
6
9
this . set (
7
- "category.custom_fields.enable_unassigned_filter" ,
8
- value ? "true" : "false"
10
+ "outletArgs. category.custom_fields.enable_unassigned_filter" ,
11
+ event . target . checked ? "true" : "false"
9
12
) ;
10
- } ,
11
- } ;
13
+ }
14
+ }
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ import { i18n } from "discourse-i18n";
5
5
6
6
export default class UserActivityAssigned extends UserTopicListRoute {
7
7
@service router ;
8
+
8
9
templateName = "user-activity-assigned" ;
9
10
controllerName = "user-activity-assigned" ;
10
11
Original file line number Diff line number Diff line change 1
1
{
2
2
"private" : true ,
3
3
"devDependencies" : {
4
- "@discourse/lint-configs" : " 2.7.0 " ,
5
- "ember-template-lint" : " 6.1.0 " ,
6
- "eslint" : " 9.20.1 " ,
7
- "prettier" : " 2.8.8 " ,
8
- "stylelint" : " 16.14.1 "
4
+ "@discourse/lint-configs" : " 2.11.1 " ,
5
+ "ember-template-lint" : " 7.0.1 " ,
6
+ "eslint" : " 9.22.0 " ,
7
+ "prettier" : " 3.5.3 " ,
8
+ "stylelint" : " 16.16.0 "
9
9
},
10
10
"engines" : {
11
11
"node" : " >= 22" ,
You can’t perform that action at this time.
0 commit comments