Skip to content
This repository was archived by the owner on Jul 14, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@ DEPENDENCIES
syntax_tree

BUNDLED WITH
2.6.5
2.6.6
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<div class="reviewable-filter discourse-assign-assign-to-filter">
<label class="filter-label">{{i18n "discourse_assign.assigned_to"}}</label>

<EmailGroupUserChooser
autocomplete="off"
@value={{this.additionalFilters.assigned_to}}
@value={{this.outletArgs.additionalFilters.assigned_to}}
@onChange={{this.updateAssignedTo}}
@options={{hash
maximum=1
fullWidthWrap=true
includeGroups=false
groupMembersOf=this.allowedGroups
}}
autocomplete="off"
/>
</div>
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
import Component from "@ember/component";
import { action } from "@ember/object";
import { service } from "@ember/service";
import { classNames } from "@ember-decorators/component";

export default {
@action
updateAssignedTo(selected) {
this.set("additionalFilters.assigned_to", selected.firstObject);
},

shouldRender(args) {
@classNames("assigned-to-filter")
export default class AssignedToFilter extends Component {
static shouldRender(args) {
return args.additionalFilters;
},
}

@service site;
@service siteSettings;

setupComponent(args, component) {
const groupIDs = (component.siteSettings.assign_allowed_on_groups || "")
.split("|")
.filter(Boolean);
const groupNames = this.site.groups
.filter((group) => groupIDs.includes(group.id.toString()))
.mapBy("name");
component.set("allowedGroups", groupNames);
},
};
groupIDs = (this.siteSettings.assign_allowed_on_groups || "")
.split("|")
.filter(Boolean);
allowedGroups = this.site.groups
.filter((group) => this.groupIDs.includes(group.id.toString()))
.mapBy("name");

@action
updateAssignedTo(selected) {
this.set("outletArgs.additionalFilters.assigned_to", selected.firstObject);
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<div class="control-group">
<label class="control-label" for="search-assigned-to">{{i18n
"search.advanced.assigned.label"
}}</label>
<label class="control-label" for="search-assigned-to">
{{i18n "search.advanced.assigned.label"}}
</label>

<div class="controls">
<EmailGroupUserChooser
@value={{this.searchedTerms.assigned}}
@onChange={{action "onChangeAssigned"}}
@value={{this.outletArgs.searchedTerms.assigned}}
@onChange={{this.onChangeAssigned}}
@options={{hash
maximum=1
excludeCurrentUser=false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
import Component from "@ember/component";
import { action } from "@ember/object";
import { service } from "@ember/service";
import { classNames } from "@ember-decorators/component";

export default {
shouldRender(args, component) {
@classNames("assigned-advanced-search")
export default class AssignedAdvancedSearch extends Component {
static shouldRender(args, component) {
return component.currentUser?.can_assign;
},
}

@service currentUser;

@action
onChangeAssigned(value) {
this.onChangeSearchedTermField(
this.outletArgs.onChangeSearchedTermField(
"assigned",
"updateSearchTermForAssignedUsername",
value
);
},
};
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<h3>{{i18n "discourse_assign.assign.title"}}</h3>

<section class="field">
<div class="enable-accepted-answer">
<label class="checkbox-label">
<Input
@type="checkbox"
@checked={{readonly this.category.enable_unassigned_filter}}
{{on "change" (action "onChangeSetting" value="target.checked")}}
@checked={{readonly this.outletArgs.category.enable_unassigned_filter}}
{{on "change" this.onChangeSetting}}
/>
{{i18n "discourse_assign.add_unassigned_filter"}}
</label>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import Component from "@ember/component";
import { action } from "@ember/object";
import { classNames } from "@ember-decorators/component";

export default {
@classNames("assign-settings")
export default class AssignSettings extends Component {
@action
onChangeSetting(value) {
onChangeSetting(event) {
this.set(
"category.custom_fields.enable_unassigned_filter",
value ? "true" : "false"
"outletArgs.category.custom_fields.enable_unassigned_filter",
event.target.checked ? "true" : "false"
);
},
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { i18n } from "discourse-i18n";

export default class UserActivityAssigned extends UserTopicListRoute {
@service router;

templateName = "user-activity-assigned";
controllerName = "user-activity-assigned";

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"private": true,
"devDependencies": {
"@discourse/lint-configs": "2.7.0",
"ember-template-lint": "6.1.0",
"eslint": "9.20.1",
"prettier": "2.8.8",
"stylelint": "16.14.1"
"@discourse/lint-configs": "2.11.1",
"ember-template-lint": "7.0.1",
"eslint": "9.22.0",
"prettier": "3.5.3",
"stylelint": "16.16.0"
},
"engines": {
"node": ">= 22",
Expand Down
Loading