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

Use username in challenge member dropdown (#11478)

Browse Source 
* update challenge member dropdown and api to display and search by username rather than display name

* remove accidental whitespace

* fix api test
This commit is contained in:
Adam Fitzgibbon
2019-11-01 13:00:42 -05:00
committed by Matteo Pagliazzi
parent 2741721161
commit dfd79c9c1a
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/api/v3/integration/challenges/GET-challenges_challengeId_members.test.js
View File

@@ -206,16 +206,16 @@ describe('GET /challenges/:challengeId/members', () => {
for (let i = 0; i < 3; i += 1) { for (let i = 0; i < 3; i += 1) {
usersToGenerate.push(generateUser({ usersToGenerate.push(generateUser({
challenges: [challenge._id], challenges: [challenge._id],
'profile.name': `${i}profilename`, 'auth.local.username': `${i}username`,
})); }));
} }
const generatedUsers = await Promise.all(usersToGenerate); const generatedUsers = await Promise.all(usersToGenerate);
const profileNames = generatedUsers.map(generatedUser => generatedUser.profile.name); const usernames = generatedUsers.map(generatedUser => generatedUser.auth.local.username);
const firstProfileName = profileNames[0]; const firstUsername = usernames[0];
const nameToSearch = firstProfileName.substring(0, 4); const nameToSearch = firstUsername.substring(0, 4);
const response = await user.get(`/challenges/${challenge._id}/members?search=${nameToSearch}`); const response = await user.get(`/challenges/${challenge._id}/members?search=${nameToSearch}`);
expect(response[0].profile.name).to.eql(firstProfileName); expect(response[0].auth.local.username).to.eql(firstUsername);
}); });
}); });

2
website/client/src/components/members/memberSearchDropdown.vue
View File

@@ -19,7 +19,7 @@
:key="member._id" :key="member._id"
@click="selectMember(member)" @click="selectMember(member)"
> >
{{ member.profile.name }} @{{ member.auth.local.username }}
</b-dropdown-item> </b-dropdown-item>
</b-dropdown> </b-dropdown>
</template> </template>

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

@@ -330,7 +330,7 @@ function _getMembersForItem (type) {
} }
if (req.query.search) { if (req.query.search) {
query['profile.name'] = { $regex: req.query.search }; query['auth.local.username'] = { $regex: req.query.search };
} }
} else if (type === 'group-members') { } else if (type === 'group-members') {
if (group.type === 'guild') { if (group.type === 'guild') {