krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(teams): smol tweaks (#12443)

Browse Source
This commit is contained in:
Sabe Jones
2020-08-10 11:27:19 -05:00
committed by GitHub
parent d016c1fa0a
commit 8c3a9c6dbc
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/client/src/components/tasks/approvalFooter.vue
View File

@@ -3,6 +3,8 @@
<approval-modal :task="task" /> <approval-modal :task="task" />
<div <div
class="claim-bottom-message d-flex align-items-center" class="claim-bottom-message d-flex align-items-center"
v-if="!(userIsAssigned && task.group.approval.approved
&& !task.completed && task.type !== 'habit')"
> >
<div <div
class="mr-auto ml-2" class="mr-auto ml-2"
@@ -108,7 +110,7 @@ export default {
assignedUsers.forEach(userId => { assignedUsers.forEach(userId => {
const index = findIndex(this.group.members, member => member._id === userId); const index = findIndex(this.group.members, member => member._id === userId);
const assignedMember = this.group.members[index]; const assignedMember = this.group.members[index];
assignedUsersNames.push(assignedMember.profile.name); assignedUsersNames.push(`@${assignedMember.auth.local.username}`);
}); });
} }

12
website/client/src/components/tasks/modal-controls/selectMulti.vue
View File

@@ -57,10 +57,16 @@ multi<template>
></div> ></div>
<div <div
v-if="item.challenge" v-if="item.challenge"
class="challenge" class="addl-text"
> >
{{ $t('challenge') }} {{ $t('challenge') }}
</div> </div>
<div
v-else-if="item.addlText"
class="addl-text"
>
{{ item.addlText }}
</div>
</b-dropdown-item-button> </b-dropdown-item-button>
<div <div
@@ -111,7 +117,7 @@ multi<template>
flex: 1; flex: 1;
} }
.challenge { .addl-text {
height: 1rem; height: 1rem;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
@@ -128,7 +134,7 @@ multi<template>
} }
&:hover { &:hover {
.challenge { .addl-text {
color: $purple-300; color: $purple-300;
} }
} }

3
website/client/src/components/tasks/taskModal.vue
View File

@@ -1265,7 +1265,8 @@ export default {
this.members.forEach(member => { this.members.forEach(member => {
this.membersNameAndId.push({ this.membersNameAndId.push({
id: member._id, id: member._id,
name: member.auth.local.username, name: member.profile.name,
addlText: `@${member.auth.local.username}`,
}); });
this.memberNamesById[member._id] = member.profile.name; this.memberNamesById[member._id] = member.profile.name;
}); });

2
website/server/controllers/api-v3/tasks/groups.js
View File

@@ -215,7 +215,7 @@ api.assignTask = {
const promises = []; const promises = [];
const taskText = task.text; const taskText = task.text;
const userName = user.profile.name; const userName = `@${user.auth.local.username}`;
if (user._id === assignedUserId) { if (user._id === assignedUserId) {
const managerIds = Object.keys(group.managers); const managerIds = Object.keys(group.managers);