mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-14 21:27:23 +01:00
clone selectMulti to selectSingle for assignedMember
This commit is contained in:
@@ -454,13 +454,11 @@
|
||||
class="col-12 mb-1"
|
||||
>{{ $t('assignedTo') }}</label>
|
||||
<div class="col-12">
|
||||
<select-multi
|
||||
ref="assignMembers"
|
||||
<select-single
|
||||
:all-items="membersNameAndId"
|
||||
:empty-message="$t('unassigned')"
|
||||
:pill-invert="true"
|
||||
:search-placeholder="$t('chooseTeamMember')"
|
||||
:selected-items="assignedMembers"
|
||||
:selected-item="assignedMember"
|
||||
@toggle="toggleAssignment($event)"
|
||||
/>
|
||||
</div>
|
||||
@@ -1044,9 +1042,11 @@ import goldIcon from '@/assets/svg/gold.svg';
|
||||
import chevronIcon from '@/assets/svg/chevron.svg';
|
||||
import calendarIcon from '@/assets/svg/calendar.svg';
|
||||
import gripIcon from '@/assets/svg/grip.svg';
|
||||
import SelectSingle from './modal-controls/selectSingle';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
SelectSingle,
|
||||
SelectMulti,
|
||||
Datepicker,
|
||||
checklist,
|
||||
@@ -1079,7 +1079,7 @@ export default {
|
||||
members: [],
|
||||
membersNameAndId: [],
|
||||
memberNamesById: {},
|
||||
assignedMembers: [],
|
||||
assignedMember: null,
|
||||
managers: [],
|
||||
showAdvancedOptions: false,
|
||||
attributesStrings: {
|
||||
@@ -1270,9 +1270,10 @@ export default {
|
||||
});
|
||||
this.memberNamesById[member._id] = member.profile.name;
|
||||
});
|
||||
this.assignedMembers = [];
|
||||
if (this.task.group && this.task.group.assignedUsers) {
|
||||
this.assignedMembers = this.task.group.assignedUsers;
|
||||
this.assignedMember = null;
|
||||
if (this.task.group?.assignedUsers?.length > 0) {
|
||||
// eslint-disable-next-line prefer-destructuring
|
||||
this.assignedMember = this.task.group.assignedUsers[0];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1457,12 +1458,11 @@ export default {
|
||||
tasks: [this.task],
|
||||
});
|
||||
Object.assign(this.task, response);
|
||||
const promises = this.assignedMembers.map(memberId => this.$store.dispatch('tasks:assignTask', {
|
||||
await this.$store.dispatch('tasks:assignTask', {
|
||||
taskId: this.task._id,
|
||||
userId: memberId,
|
||||
}));
|
||||
Promise.all(promises);
|
||||
this.task.group.assignedUsers = this.assignedMembers;
|
||||
userId: this.assignedMember,
|
||||
});
|
||||
this.task.group.assignedUsers = [this.assignedMember];
|
||||
this.$emit('taskCreated', this.task);
|
||||
} else {
|
||||
this.createTask(this.task);
|
||||
@@ -1493,9 +1493,7 @@ export default {
|
||||
return;
|
||||
}
|
||||
|
||||
const assignedIndex = this.assignedMembers.indexOf(memberId);
|
||||
|
||||
if (assignedIndex === -1) {
|
||||
if (this.assignedMember === null) {
|
||||
await this.$store.dispatch('tasks:unassignTask', {
|
||||
taskId: this.task._id,
|
||||
userId: memberId,
|
||||
@@ -1506,6 +1504,8 @@ export default {
|
||||
userId: memberId,
|
||||
});
|
||||
}
|
||||
|
||||
this.assignedMember = memberId;
|
||||
},
|
||||
focusInput () {
|
||||
this.$refs.inputToFocus.focus();
|
||||
|
||||
Reference in New Issue
Block a user