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

Rename @model to @assignment

This commit is contained in:
Andrei Prigorshnev 2024-04-02 18:05:46 +04:00
parent ba1a2844ee
commit 47245339e7
No known key found for this signature in database
GPG Key ID: 185E0A5F45783902
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/javascripts/discourse/components/assign-user-form.hbs
View File

@ -1,4 +1,4 @@
<Assignment <Assignment
@model={{@model}} @assignment={{@model}}
@onSubmit={{this.assign}} @onSubmit={{this.assign}}
@showValidationErrors={{this.showValidationErrors}} /> @showValidationErrors={{this.showValidationErrors}} />

4
assets/javascripts/discourse/components/assignment.hbs
View File

@ -36,7 +36,7 @@
@id="assign-status" @id="assign-status"
@content={{this.assignStatusOptions}} @content={{this.assignStatusOptions}}
@value={{this.status}} @value={{this.status}}
@onChange={{fn (mut @model.status)}} @onChange={{fn (mut @assignment.status)}}
/> />
</div> </div>
{{/if}} {{/if}}
@ -49,7 +49,7 @@
<Textarea <Textarea
id="assign-modal-note" id="assign-modal-note"
@value={{@model.note}} @value={{@assignment.note}}
{{on "keydown" this.handleTextAreaKeydown}} {{on "keydown" this.handleTextAreaKeydown}}
/> />
</div> </div>

15
assets/javascripts/discourse/components/assignment.js
View File

@ -7,14 +7,15 @@ export default class Assignment extends Component {
@service siteSettings; @service siteSettings;
@service taskActions; @service taskActions;
@tracked assignee = this.args.model.username || this.args.model.group_name; @tracked assignee =
this.args.assignment.username || this.args.assignment.group_name;
constructor() { constructor() {
super(...arguments); super(...arguments);
} }
get status() { get status() {
return this.args.model.status || this.assignStatuses[0]; return this.args.assignment.status || this.assignStatuses[0];
} }
get assignStatuses() { get assignStatuses() {
@ -26,7 +27,7 @@ export default class Assignment extends Component {
} }
get assigneeIsEmpty() { get assigneeIsEmpty() {
return !this.args.model.username && !this.args.model.group_name; return !this.args.assignment.username && !this.args.assignment.group_name;
} }
get showAssigneeIeEmptyError() { get showAssigneeIeEmptyError() {
@ -45,11 +46,11 @@ export default class Assignment extends Component {
this.assignee = newAssignee; this.assignee = newAssignee;
if (this.taskActions.allowedGroupsForAssignment.includes(newAssignee)) { if (this.taskActions.allowedGroupsForAssignment.includes(newAssignee)) {
this.args.model.username = null; this.args.assignment.username = null;
this.args.model.group_name = newAssignee; this.args.assignment.group_name = newAssignee;
} else { } else {
this.args.model.username = newAssignee; this.args.assignment.username = newAssignee;
this.args.model.group_name = null; this.args.assignment.group_name = null;
} }
} }
} }