Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-09-22 01:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'Emile840-master'

Browse source
This commit is contained in:
Lauri Ojansivu 2021-06-08 01:24:54 +03:00
commit 7e036b9df3
6 changed files with 128 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

44
client/components/settings/peopleBody.jade
View file

@ -132,28 +132,28 @@ template(name="newUserRow")
template(name="orgRow") template(name="orgRow")
tr tr
if orgData.loginDisabled if orgData.orgIsActive
td <s>{{ orgData.orgDisplayName }}</s> td <s>{{ orgData.orgDisplayName }}</s>
else else
td {{ orgData.orgDisplayName }} td {{ orgData.orgDisplayName }}
if orgData.loginDisabled if orgData.orgIsActive
td <s>{{ orgData.orgDesc }}</s> td <s>{{ orgData.orgDesc }}</s>
else else
td {{ orgData.orgDesc }} td {{ orgData.orgDesc }}
if orgData.loginDisabled if orgData.orgIsActive
td <s>{{ orgData.orgName }}</s> td <s>{{ orgData.orgShortName }}</s>
else else
td {{ orgData.orgName }} td {{ orgData.orgShortName }}
if orgData.loginDisabled if orgData.orgIsActive
td <s>{{ orgData.orgWebsite }}</s> td <s>{{ orgData.orgWebsite }}</s>
else else
td {{ orgData.orgWebsite }} td {{ orgData.orgWebsite }}
if orgData.loginDisabled if orgData.orgIsActive
td <s>{{ moment orgData.createdAt 'LLL' }}</s> td <s>{{ moment orgData.createdAt 'LLL' }}</s>
else else
td {{ moment orgData.createdAt 'LLL' }} td {{ moment orgData.createdAt 'LLL' }}
td td
if orgData.loginDisabled if orgData.orgIsActive
| {{_ 'no'}} | {{_ 'no'}}
else else
| {{_ 'yes'}} | {{_ 'yes'}}
@ -166,28 +166,28 @@ template(name="orgRow")
template(name="teamRow") template(name="teamRow")
tr tr
if teamData.loginDisabled if teamData.teamIsActive
td <s>{{ teamData.teamDisplayName }}</s> td <s>{{ teamData.teamDisplayName }}</s>
else else
td {{ teamData.teamDisplayName }} td {{ teamData.teamDisplayName }}
if teamData.loginDisabled if teamData.teamIsActive
td <s>{{ teamData.teamDesc }}</s> td <s>{{ teamData.teamDesc }}</s>
else else
td {{ teamData.teamDesc }} td {{ teamData.teamDesc }}
if teamData.loginDisabled if teamData.teamIsActive
td <s>{{ teamData.teamName }}</s> td <s>{{ teamData.teamShortName }}</s>
else else
td {{ teamData.teamName }} td {{ teamData.teamShortName }}
if teamData.loginDisabled if teamData.teamIsActive
td <s>{{ teamData.teamWebsite }}</s> td <s>{{ teamData.teamWebsite }}</s>
else else
td {{ teamData.teamWebsite }} td {{ teamData.teamWebsite }}
if orgData.loginDisabled if teamData.teamIsActive
td <s>{{ moment teamData.createdAt 'LLL' }}</s> td <s>{{ moment teamData.createdAt 'LLL' }}</s>
else else
td {{ moment teamData.createdAt 'LLL' }} td {{ moment teamData.createdAt 'LLL' }}
td td
if teamData.loginDisabled if teamData.teamIsActive
| {{_ 'no'}} | {{_ 'no'}}
else else
| {{_ 'yes'}} | {{_ 'yes'}}
@ -268,8 +268,8 @@ template(name="editOrgPopup")
form form
label.hide.orgId(type="text" value=org._id) label.hide.orgId(type="text" value=org._id)
label label
| {{_ 'displayName'}} | {{_ 'orgDisplayName'}}
input.js-orgDisplayName(type="text" value=org.displayName required) input.js-orgDisplayName(type="text" value=org.orgDisplayName required)
span.error.hide.orgname-taken span.error.hide.orgname-taken
| {{_ 'error-orgname-taken'}} | {{_ 'error-orgname-taken'}}
label label
@ -285,7 +285,7 @@ template(name="editOrgPopup")
| {{_ 'active'}} | {{_ 'active'}}
select.select-active.js-org-isactive select.select-active.js-org-isactive
option(value="false") {{_ 'yes'}} option(value="false") {{_ 'yes'}}
option(value="true" selected="{{org.loginDisabled}}") {{_ 'no'}} option(value="true" selected="{{org.orgIsActive}}") {{_ 'no'}}
hr hr
div.buttonsContainer div.buttonsContainer
input.primary.wide(type="submit" value="{{_ 'save'}}") input.primary.wide(type="submit" value="{{_ 'save'}}")
@ -311,7 +311,7 @@ template(name="editTeamPopup")
| {{_ 'active'}} | {{_ 'active'}}
select.select-active.js-team-isactive select.select-active.js-team-isactive
option(value="false") {{_ 'yes'}} option(value="false") {{_ 'yes'}}
option(value="true" selected="{{team.loginDisabled}}") {{_ 'no'}} option(value="true" selected="{{team.teamIsActive}}") {{_ 'no'}}
hr hr
div.buttonsContainer div.buttonsContainer
input.primary.wide(type="submit" value="{{_ 'save'}}") input.primary.wide(type="submit" value="{{_ 'save'}}")
@ -385,7 +385,7 @@ template(name="newOrgPopup")
input.js-orgDesc(type="text" value="" required) input.js-orgDesc(type="text" value="" required)
label label
| {{_ 'shortName'}} | {{_ 'shortName'}}
input.js-orgName(type="text" value="" required) input.js-orgShortName(type="text" value="" required)
label label
| {{_ 'website'}} | {{_ 'website'}}
input.js-orgWebsite(type="text" value="" required) input.js-orgWebsite(type="text" value="" required)
@ -409,7 +409,7 @@ template(name="newTeamPopup")
input.js-teamDesc(type="text" value="" required) input.js-teamDesc(type="text" value="" required)
label label
| {{_ 'shortName'}} | {{_ 'shortName'}}
input.js-teamName(type="text" value="" required) input.js-teamShortName(type="text" value="" required)
label label
| {{_ 'website'}} | {{_ 'website'}}
input.js-teamWebsite(type="text" value="" required) input.js-teamWebsite(type="text" value="" required)

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

@ -150,7 +150,7 @@ BlazeComponent.extendComponent({
const teams = Team.find(this.findTeamsOptions.get(), { const teams = Team.find(this.findTeamsOptions.get(), {
fields: { _id: true }, fields: { _id: true },
}); });
this.numberTeams.set(team.count(false)); this.numberTeams.set(teams.count(false));
return teams; return teams;
}, },
peopleList() { peopleList() {
@ -407,7 +407,7 @@ BlazeComponent.extendComponent({
Template.editOrgPopup.events({ Template.editOrgPopup.events({
submit(event, templateInstance) { submit(event, templateInstance) {
event.preventDefault(); event.preventDefault();
const org = Orgs.findOne(this.orgId); const org = Org.findOne(this.orgId);
const orgDisplayName = templateInstance const orgDisplayName = templateInstance
.find('.js-orgDisplayName') .find('.js-orgDisplayName')
@ -415,7 +415,7 @@ Template.editOrgPopup.events({
const orgDesc = templateInstance.find('.js-orgDesc').value.trim(); const orgDesc = templateInstance.find('.js-orgDesc').value.trim();
const orgShortName = templateInstance.find('.js-orgShortName').value.trim(); const orgShortName = templateInstance.find('.js-orgShortName').value.trim();
const orgWebsite = templateInstance.find('.js-orgWebsite').value.trim(); const orgWebsite = templateInstance.find('.js-orgWebsite').value.trim();
const orgIsActive = templateInstance.find('.js-org-isactive').value.trim(); const orgIsActive = templateInstance.find('.js-org-isactive').value.trim() == 'true';
const isChangeOrgDisplayName = orgDisplayName !== org.orgDisplayName; const isChangeOrgDisplayName = orgDisplayName !== org.orgDisplayName;
const isChangeOrgDesc = orgDesc !== org.orgDesc; const isChangeOrgDesc = orgDesc !== org.orgDesc;
@ -423,21 +423,25 @@ Template.editOrgPopup.events({
const isChangeOrgWebsite = orgWebsite !== org.orgWebsite; const isChangeOrgWebsite = orgWebsite !== org.orgWebsite;
const isChangeOrgIsActive = orgIsActive !== org.orgIsActive; const isChangeOrgIsActive = orgIsActive !== org.orgIsActive;
if (isChangeOrgDisplayName) { if(isChangeOrgDisplayName || isChangeOrgDesc || isChangeOrgShortName || isChangeOrgWebsite || isChangeOrgIsActive){
Meteor.call('setOrgDisplayName', org, orgDisplayName); Meteor.call('setOrgAllFields', org, orgDisplayName, orgDesc, orgShortName, orgWebsite, orgIsActive);
} }
if (isChangeOrgDesc) { // if (isChangeOrgDisplayName) {
Meteor.call('setOrgDesc', org, orgDesc); // Meteor.call('setOrgDisplayName', org, orgDisplayName);
} // }
if (isChangeOrgShortName) { // if (isChangeOrgDesc) {
Meteor.call('setOrgShortName', org, orgShortName); // Meteor.call('setOrgDesc', org, orgDesc);
} // }
if (isChangeOrgIsActive) { // if (isChangeOrgShortName) {
Meteor.call('setOrgIsActive', org, orgIsActive); // Meteor.call('setOrgShortName', org, orgShortName);
} // }
// if (isChangeOrgIsActive) {
// Meteor.call('setOrgIsActive', org, orgIsActive);
// }
Popup.close(); Popup.close();
}, },
@ -446,7 +450,7 @@ Template.editOrgPopup.events({
Template.editTeamPopup.events({ Template.editTeamPopup.events({
submit(event, templateInstance) { submit(event, templateInstance) {
event.preventDefault(); event.preventDefault();
const team = Teams.findOne(this.teamId); const team = Team.findOne(this.teamId);
const teamDisplayName = templateInstance const teamDisplayName = templateInstance
.find('.js-teamDisplayName') .find('.js-teamDisplayName')
@ -456,9 +460,7 @@ Template.editTeamPopup.events({
.find('.js-teamShortName') .find('.js-teamShortName')
.value.trim(); .value.trim();
const teamWebsite = templateInstance.find('.js-teamWebsite').value.trim(); const teamWebsite = templateInstance.find('.js-teamWebsite').value.trim();
const teamIsActive = templateInstance const teamIsActive = templateInstance.find('.js-team-isactive').value.trim() == 'true';
.find('.js-team-isactive')
.value.trim();
const isChangeTeamDisplayName = teamDisplayName !== team.teamDisplayName; const isChangeTeamDisplayName = teamDisplayName !== team.teamDisplayName;
const isChangeTeamDesc = teamDesc !== team.teamDesc; const isChangeTeamDesc = teamDesc !== team.teamDesc;
@ -466,21 +468,24 @@ Template.editTeamPopup.events({
const isChangeTeamWebsite = teamWebsite !== team.teamWebsite; const isChangeTeamWebsite = teamWebsite !== team.teamWebsite;
const isChangeTeamIsActive = teamIsActive !== team.teamIsActive; const isChangeTeamIsActive = teamIsActive !== team.teamIsActive;
if (isChangeTeamDisplayName) { if(isChangeTeamDisplayName || isChangeTeamDesc || isChangeTeamShortName || isChangeTeamWebsite || isChangeTeamIsActive){
Meteor.call('setTeamDisplayName', team, teamDisplayName); Meteor.call('setTeamAllFields', team, teamDisplayName, teamDesc, teamShortName, teamWebsite, teamIsActive);
} }
// if (isChangeTeamDisplayName) {
// Meteor.call('setTeamDisplayName', team, teamDisplayName);
// }
if (isChangeTeamDesc) { // if (isChangeTeamDesc) {
Meteor.call('setTeamDesc', team, teamDesc); // Meteor.call('setTeamDesc', team, teamDesc);
} // }
if (isChangeTeamShortName) { // if (isChangeTeamShortName) {
Meteor.call('setTeamShortName', team, teamShortName); // Meteor.call('setTeamShortName', team, teamShortName);
} // }
if (isChangeTeamIsActive) { // if (isChangeTeamIsActive) {
Meteor.call('setTeamIsActive', team, teamIsActive); // Meteor.call('setTeamIsActive', team, teamIsActive);
} // }
Popup.close(); Popup.close();
}, },
@ -608,7 +613,7 @@ Template.newOrgPopup.events({
const orgDesc = templateInstance.find('.js-orgDesc').value.trim(); const orgDesc = templateInstance.find('.js-orgDesc').value.trim();
const orgShortName = templateInstance.find('.js-orgShortName').value.trim(); const orgShortName = templateInstance.find('.js-orgShortName').value.trim();
const orgWebsite = templateInstance.find('.js-orgWebsite').value.trim(); const orgWebsite = templateInstance.find('.js-orgWebsite').value.trim();
const orgIsActive = templateInstance.find('.js-org-isactive').value.trim(); const orgIsActive = templateInstance.find('.js-org-isactive').value.trim() == 'true';
Meteor.call( Meteor.call(
'setCreateOrg', 'setCreateOrg',
@ -633,9 +638,7 @@ Template.newTeamPopup.events({
.find('.js-teamShortName') .find('.js-teamShortName')
.value.trim(); .value.trim();
const teamWebsite = templateInstance.find('.js-teamWebsite').value.trim(); const teamWebsite = templateInstance.find('.js-teamWebsite').value.trim();
const teamIsActive = templateInstance const teamIsActive = templateInstance.find('.js-team-isactive').value.trim() == 'true';
.find('.js-team-isactive')
.value.trim();
Meteor.call( Meteor.call(
'setCreateTeam', 'setCreateTeam',

39
models/org.js
View file

@ -36,11 +36,19 @@ Org.attachSchema(
optional: true, optional: true,
max: 255, max: 255,
}, },
orgIsActive: {
/**
* status of the organization
*/
type: Boolean,
optional: true,
},
createdAt: { createdAt: {
/** /**
* creation date of the organization * creation date of the organization
*/ */
type: Date, type: Date,
denyUpdate: false,
// eslint-disable-next-line consistent-return // eslint-disable-next-line consistent-return
autoValue() { autoValue() {
if (this.isInsert) { if (this.isInsert) {
@ -81,7 +89,7 @@ if (Meteor.isServer) {
check(orgDesc, String); check(orgDesc, String);
check(orgShortName, String); check(orgShortName, String);
check(orgWebsite, String); check(orgWebsite, String);
check(orgIsActive, String); check(orgIsActive, Boolean);
const nOrgNames = Org.find({ orgShortName }).count(); const nOrgNames = Org.find({ orgShortName }).count();
if (nOrgNames > 0) { if (nOrgNames > 0) {
@ -100,17 +108,17 @@ if (Meteor.isServer) {
setOrgDisplayName(org, orgDisplayName) { setOrgDisplayName(org, orgDisplayName) {
if (Meteor.user() && Meteor.user().isAdmin) { if (Meteor.user() && Meteor.user().isAdmin) {
check(org, String); check(org, Object);
check(orgDisplayName, String); check(orgDisplayName, String);
Org.update(org, { Org.update(org, {
$set: { orgDisplayName: orgDisplayName }, $set: { orgDisplayName: orgDisplayNameorgShortName},
}); });
} }
}, },
setOrgDesc(org, orgDesc) { setOrgDesc(org, orgDesc) {
if (Meteor.user() && Meteor.user().isAdmin) { if (Meteor.user() && Meteor.user().isAdmin) {
check(org, String); check(org, Object);
check(orgDesc, String); check(orgDesc, String);
Org.update(org, { Org.update(org, {
$set: { orgDesc: orgDesc }, $set: { orgDesc: orgDesc },
@ -120,7 +128,7 @@ if (Meteor.isServer) {
setOrgShortName(org, orgShortName) { setOrgShortName(org, orgShortName) {
if (Meteor.user() && Meteor.user().isAdmin) { if (Meteor.user() && Meteor.user().isAdmin) {
check(org, String); check(org, Object);
check(orgShortName, String); check(orgShortName, String);
Org.update(org, { Org.update(org, {
$set: { orgShortName: orgShortName }, $set: { orgShortName: orgShortName },
@ -130,20 +138,35 @@ if (Meteor.isServer) {
setOrgIsActive(org, orgIsActive) { setOrgIsActive(org, orgIsActive) {
if (Meteor.user() && Meteor.user().isAdmin) { if (Meteor.user() && Meteor.user().isAdmin) {
check(org, String); check(org, Object);
check(orgIsActive, String); check(orgIsActive, Boolean);
Org.update(org, { Org.update(org, {
$set: { orgIsActive: orgIsActive }, $set: { orgIsActive: orgIsActive },
}); });
} }
}, },
setOrgAllFields(org, orgDisplayName, orgDesc, orgShortName, orgWebsite, orgIsActive) {
if (Meteor.user() && Meteor.user().isAdmin) {
check(org, Object);
check(orgDisplayName, String);
check(orgDesc, String);
check(orgShortName, String);
check(orgWebsite, String);
check(orgIsActive, Boolean);
Org.update(org, {
$set: { orgDisplayName : orgDisplayName, orgDesc : orgDesc, orgShortName : orgShortName, orgWebsite : orgWebsite, orgIsActive: orgIsActive },
});
}
},
}); });
} }
if (Meteor.isServer) { 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 });
}); });
} }

35
models/team.js
View file

@ -36,6 +36,13 @@ Team.attachSchema(
optional: true, optional: true,
max: 255, max: 255,
}, },
teamIsActive: {
/**
* status of the team
*/
type: Boolean,
optional: true,
},
createdAt: { createdAt: {
/** /**
* creation date of the team * creation date of the team
@ -81,7 +88,7 @@ if (Meteor.isServer) {
check(teamDesc, String); check(teamDesc, String);
check(teamShortName, String); check(teamShortName, String);
check(teamWebsite, String); check(teamWebsite, String);
check(teamIsActive, String); check(teamIsActive, Boolean);
const nTeamNames = Team.find({ teamShortName }).count(); const nTeamNames = Team.find({ teamShortName }).count();
if (nTeamNames > 0) { if (nTeamNames > 0) {
@ -100,7 +107,7 @@ if (Meteor.isServer) {
setTeamDisplayName(team, teamDisplayName) { setTeamDisplayName(team, teamDisplayName) {
if (Meteor.user() && Meteor.user().isAdmin) { if (Meteor.user() && Meteor.user().isAdmin) {
check(team, String); check(team, Object);
check(teamDisplayName, String); check(teamDisplayName, String);
Team.update(team, { Team.update(team, {
$set: { teamDisplayName: teamDisplayName }, $set: { teamDisplayName: teamDisplayName },
@ -110,7 +117,7 @@ if (Meteor.isServer) {
setTeamDesc(team, teamDesc) { setTeamDesc(team, teamDesc) {
if (Meteor.user() && Meteor.user().isAdmin) { if (Meteor.user() && Meteor.user().isAdmin) {
check(team, String); check(team, Object);
check(teamDesc, String); check(teamDesc, String);
Team.update(team, { Team.update(team, {
$set: { teamDesc: teamDesc }, $set: { teamDesc: teamDesc },
@ -120,7 +127,7 @@ if (Meteor.isServer) {
setTeamShortName(team, teamShortName) { setTeamShortName(team, teamShortName) {
if (Meteor.user() && Meteor.user().isAdmin) { if (Meteor.user() && Meteor.user().isAdmin) {
check(team, String); check(team, Object);
check(teamShortName, String); check(teamShortName, String);
Team.update(team, { Team.update(team, {
$set: { teamShortName: teamShortName }, $set: { teamShortName: teamShortName },
@ -130,20 +137,34 @@ if (Meteor.isServer) {
setTeamIsActive(team, teamIsActive) { setTeamIsActive(team, teamIsActive) {
if (Meteor.user() && Meteor.user().isAdmin) { if (Meteor.user() && Meteor.user().isAdmin) {
check(team, String); check(team, Object);
check(teamIsActive, String); check(teamIsActive, Boolean);
Team.update(team, { Team.update(team, {
$set: { teamIsActive: teamIsActive }, $set: { teamIsActive: teamIsActive },
}); });
} }
}, },
setTeamAllFields(team, teamDisplayName, teamDesc, teamShortName, teamWebsite, teamIsActive) {
if (Meteor.user() && Meteor.user().isAdmin) {
check(team, Object);
check(teamDisplayName, String);
check(teamDesc, String);
check(teamShortName, String);
check(teamWebsite, String);
check(teamIsActive, Boolean);
Team.update(team, {
$set: { teamDisplayName: teamDisplayName, teamDesc: teamDesc, teamShortName: teamShortName, teamWebsite: teamWebsite, teamIsActive: teamIsActive },
});
}
},
}); });
} }
if (Meteor.isServer) { if (Meteor.isServer) {
// Index for Team name. // Index for Team name.
Meteor.startup(() => { Meteor.startup(() => {
Team._collection._ensureIndex({ name: -1 }); Team._collection._ensureIndex({ teamDisplayName: -1 });
}); });
} }

12
server/publications/org.js
View file

@ -12,13 +12,13 @@ Meteor.publish('org', function(query, limit) {
limit, limit,
sort: { createdAt: -1 }, sort: { createdAt: -1 },
fields: { fields: {
displayName: 1, orgDisplayName: 1,
desc: 1, orgDesc: 1,
name: 1, orgShortName: 1,
website: 1, orgWebsite: 1,
teams: 1, orgTeams: 1,
createdAt: 1, createdAt: 1,
loginDisabled: 1, orgIsActive: 1,
}, },
}); });
} }

10
server/publications/team.js
View file

@ -12,13 +12,13 @@ Meteor.publish('team', function(query, limit) {
limit, limit,
sort: { createdAt: -1 }, sort: { createdAt: -1 },
fields: { fields: {
displayName: 1, teamDisplayName: 1,
desc: 1, teamDesc: 1,
name: 1, teamShortName: 1,
website: 1, teamWebsite: 1,
teams: 1, teams: 1,
createdAt: 1, createdAt: 1,
loginDisabled: 1, teamIsActive: 1,
}, },
}); });
} }