FIX: broken suggestions (#189)
We need to pass name to assignUser because it is used in 2 places. One is multiselect and another are suggestions.
This commit is contained in:
parent
1306a69b06
commit
9d7d39705e
|
@ -39,27 +39,27 @@ export default Controller.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
@action
|
@action
|
||||||
assignUser(assignee) {
|
assignUser(name) {
|
||||||
if (this.isBulkAction) {
|
if (this.isBulkAction) {
|
||||||
this.bulkAction(assignee.name);
|
this.bulkAction(name);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.allowedGroupsForAssignment.includes(assignee.name)) {
|
if (this.allowedGroupsForAssignment.includes(name)) {
|
||||||
this.setProperties({
|
this.setProperties({
|
||||||
"model.username": null,
|
"model.username": null,
|
||||||
"model.group_name": assignee.name,
|
"model.group_name": name,
|
||||||
"model.allowedGroups": this.taskActions.allowedGroups,
|
"model.allowedGroups": this.taskActions.allowedGroups,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
this.setProperties({
|
this.setProperties({
|
||||||
"model.username": assignee.name,
|
"model.username": name,
|
||||||
"model.group_name": null,
|
"model.group_name": null,
|
||||||
"model.allowedGroups": this.taskActions.allowedGroups,
|
"model.allowedGroups": this.taskActions.allowedGroups,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (assignee.name) {
|
if (name) {
|
||||||
return this.assign();
|
return this.assign();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -107,6 +107,6 @@ export default Controller.extend({
|
||||||
|
|
||||||
@action
|
@action
|
||||||
assignUsername(selected) {
|
assignUsername(selected) {
|
||||||
this.assignUser({ name: selected.firstObject });
|
this.assignUser(selected.firstObject);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
}}
|
}}
|
||||||
<div class="assign-suggestions">
|
<div class="assign-suggestions">
|
||||||
{{#each assignSuggestions as |user|}}
|
{{#each assignSuggestions as |user|}}
|
||||||
<a href {{action "assignUser" user}}>
|
<a href {{action "assignUser" user.username }}>
|
||||||
{{avatar user imageSize="small"}}
|
{{avatar user imageSize="small"}}
|
||||||
</a>
|
</a>
|
||||||
{{/each}}
|
{{/each}}
|
||||||
|
|
Loading…
Reference in New Issue