This commit is contained in:
Andrei Prigorshnev 2024-04-02 00:37:40 +04:00
parent 19c2542499
commit 572a9a4223
No known key found for this signature in database
GPG Key ID: 185E0A5F45783902
4 changed files with 6 additions and 10 deletions

View File

@ -1,6 +1,6 @@
<Assignment
@assigneeError={{this.assigneeError}}
@model={{@model}}
@note={{@model.note}}
@status={{@model.status}}
@onSubmit={{this.assign}} />
@onSubmit={{this.assign}}
@showAssigneeError={{this.assigneeError}}/>

View File

@ -9,9 +9,6 @@ export default class AssignUserForm extends Component {
@service capabilities;
@tracked assigneeError = false;
@tracked
assigneeName = this.args.model.username || this.args.model.group_name;
constructor() {
super(...arguments);
@ -20,8 +17,7 @@ export default class AssignUserForm extends Component {
@action
async assign() {
console.log("ass");
if (!this.assigneeName) {
if (!(this.args.model.username || this.args.model.group_name)) {
this.assigneeError = true;
return;
}

View File

@ -1,4 +1,4 @@
<div class="control-group {{if @assigneeError 'assignee-error'}}">
<div class="control-group {{if @showAssigneeError 'assignee-error'}}">
<label>{{i18n "discourse_assign.assign_modal.assignee_label"}}</label>
<AssigneeChooser
autocomplete="off"
@ -21,7 +21,7 @@
}}
/>
{{#if @assigneeError}}
{{#if @showAssigneeError}}
<span class="error-label">
{{d-icon "exclamation-triangle"}}
{{i18n "discourse_assign.assign_modal.choose_assignee"}}

View File

@ -31,7 +31,7 @@ export default class Assignment extends Component {
@action
setAssignee([newAssignee]) {
this.assignee = newAssignee;
this.args.assigneeError = false;
// this.args.showAssigneeError = false;
if (this.taskActions.allowedGroupsForAssignment.includes(newAssignee)) {
this.args.model.username = null;