Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-03-09 23:22:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #4232 from Ben0it-T/sort_organizations_teams_people

Browse source 
Sort Organizations, Teams and People
This commit is contained in:
Lauri Ojansivu 2021-12-14 23:44:21 +02:00 • committed by GitHub
commit 73408c73af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/components/boards/boardsList.js
View file

@ -89,7 +89,7 @@ BlazeComponent.extendComponent({
}, },
teamsDatas() { teamsDatas() {
if(Meteor.user().teams) if(Meteor.user().teams)
return Meteor.user().teams; return Meteor.user().teams.sort((a, b) => a.teamDisplayName.localeCompare(b.teamDisplayName));
else else
return []; return [];
}, },
@ -101,7 +101,7 @@ BlazeComponent.extendComponent({
}, },
orgsDatas() { orgsDatas() {
if(Meteor.user().orgs) if(Meteor.user().orgs)
return Meteor.user().orgs; return Meteor.user().orgs.sort((a, b) => a.orgDisplayName.localeCompare(b.orgDisplayName));
else else
return []; return [];
}, },

13
client/components/settings/peopleBody.js
View file

@ -144,6 +144,7 @@ BlazeComponent.extendComponent({
}, },
orgList() { orgList() {
const orgs = Org.find(this.findOrgsOptions.get(), { const orgs = Org.find(this.findOrgsOptions.get(), {
sort: { orgDisplayName: 1 },
fields: { _id: true }, fields: { _id: true },
}); });
this.numberOrgs.set(orgs.count(false)); this.numberOrgs.set(orgs.count(false));
@ -151,6 +152,7 @@ BlazeComponent.extendComponent({
}, },
teamList() { teamList() {
const teams = Team.find(this.findTeamsOptions.get(), { const teams = Team.find(this.findTeamsOptions.get(), {
sort: { teamDisplayName: 1 },
fields: { _id: true }, fields: { _id: true },
}); });
this.numberTeams.set(teams.count(false)); this.numberTeams.set(teams.count(false));
@ -158,6 +160,7 @@ BlazeComponent.extendComponent({
}, },
peopleList() { peopleList() {
const users = Users.find(this.findUsersOptions.get(), { const users = Users.find(this.findUsersOptions.get(), {
sort: { username: 1 },
fields: { _id: true }, fields: { _id: true },
}); });
this.numberPeople.set(users.count(false)); this.numberPeople.set(users.count(false));
@ -251,10 +254,10 @@ Template.editUserPopup.helpers({
return Template.instance().authenticationMethods.get(); return Template.instance().authenticationMethods.get();
}, },
orgsDatas() { orgsDatas() {
return Org.find({}, {sort: { createdAt: -1 }}); return Org.find({}, {sort: { orgDisplayName: 1 }});
}, },
teamsDatas() { teamsDatas() {
return Team.find({}, {sort: { createdAt: -1 }}); return Team.find({}, {sort: { teamDisplayName: 1 }});
}, },
isSelected(match) { isSelected(match) {
const userId = Template.instance().data.userId; const userId = Template.instance().data.userId;
@ -324,10 +327,10 @@ Template.newUserPopup.helpers({
return Template.instance().authenticationMethods.get(); return Template.instance().authenticationMethods.get();
}, },
orgsDatas() { orgsDatas() {
return Org.find({}, {sort: { createdAt: -1 }}); return Org.find({}, {sort: { orgDisplayName: 1 }});
}, },
teamsDatas() { teamsDatas() {
return Team.find({}, {sort: { createdAt: -1 }}); return Team.find({}, {sort: { teamDisplayName: 1 }});
}, },
isSelected(match) { isSelected(match) {
const userId = Template.instance().data.userId; const userId = Template.instance().data.userId;
@ -417,7 +420,7 @@ BlazeComponent.extendComponent({
BlazeComponent.extendComponent({ BlazeComponent.extendComponent({
onCreated() {}, onCreated() {},
teamsDatas() { teamsDatas() {
return Team.find({}, {sort: { createdAt: -1 }}); return Team.find({}, {sort: { teamDisplayName: 1 }});
}, },
events() { events() {
return [ return [

5
client/components/sidebar/sidebar.js
View file

@ -1325,8 +1325,7 @@ BlazeComponent.extendComponent({
Template.addBoardOrgPopup.helpers({ Template.addBoardOrgPopup.helpers({
orgsDatas() { orgsDatas() {
// return Org.find({}, {sort: { createdAt: -1 }}); let orgs = Org.find({}, {sort: { orgDisplayName: 1 }});
let orgs = Org.find({}, {sort: { createdAt: -1 }});
return orgs; return orgs;
}, },
}); });
@ -1499,7 +1498,7 @@ BlazeComponent.extendComponent({
Template.addBoardTeamPopup.helpers({ Template.addBoardTeamPopup.helpers({
teamsDatas() { teamsDatas() {
let teams = Team.find({}, {sort: { createdAt: -1 }}); let teams = Team.find({}, {sort: { teamDisplayName: 1 }});
return teams; return teams;
}, },
}); });

2
models/org.js
View file

@ -217,7 +217,7 @@ if (Meteor.isServer) {
// Index for Organization name. // Index for Organization name.
Meteor.startup(() => { Meteor.startup(() => {
// Org._collection._ensureIndex({ name: -1 }); // Org._collection._ensureIndex({ name: -1 });
Org._collection._ensureIndex({ orgDisplayName: -1 }); Org._collection._ensureIndex({ orgDisplayName: 1 });
}); });
} }

2
models/team.js
View file

@ -214,7 +214,7 @@ if (Meteor.isServer) {
if (Meteor.isServer) { if (Meteor.isServer) {
// Index for Team name. // Index for Team name.
Meteor.startup(() => { Meteor.startup(() => {
Team._collection._ensureIndex({ teamDisplayName: -1 }); Team._collection._ensureIndex({ teamDisplayName: 1 });
}); });
} }

4
models/users.js
View file

@ -521,7 +521,7 @@ Users.helpers({
}, },
orgsUserBelongs() { orgsUserBelongs() {
if (this.orgs) { if (this.orgs) {
return this.orgs.map(function(org){return org.orgDisplayName}).join(','); return this.orgs.map(function(org){return org.orgDisplayName}).sort().join(',');
} }
return ''; return '';
}, },
@ -533,7 +533,7 @@ Users.helpers({
}, },
teamsUserBelongs() { teamsUserBelongs() {
if (this.teams) { if (this.teams) {
return this.teams.map(function(team){ return team.teamDisplayName}).join(','); return this.teams.map(function(team){ return team.teamDisplayName}).sort().join(',');
} }
return ''; return '';
}, },