diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade index 6291b9779..e985fb11f 100644 --- a/client/components/settings/peopleBody.jade +++ b/client/components/settings/peopleBody.jade @@ -531,6 +531,9 @@ template(name="settingsOrgPopup") ul.pop-over-list li form + label#deleteOrgWarningMessage.hide + | {{_ 'delete-org-warning-message'}} + br label | {{_ 'delete-org-confirm-popup'}} br @@ -552,6 +555,9 @@ template(name="settingsTeamPopup") ul.pop-over-list li form + label#deleteTeamWarningMessage.hide + | {{_ 'delete-team-warning-message'}} + br label | {{_ 'delete-team-confirm-popup'}} br diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js index aecbf50e0..ab6d1fbd2 100644 --- a/client/components/settings/peopleBody.js +++ b/client/components/settings/peopleBody.js @@ -551,12 +551,15 @@ Template.editUserPopup.events({ let userTeamsList = userTeams.split(","); let userTeamsIdsList = userTeamsIds.split(","); let userTms = []; - for(let i = 0; i < userTeamsList.length; i++){ - userTms.push({ - "teamId": userTeamsIdsList[i], - "teamDisplayName": userTeamsList[i], - }) + if(userTeams != ''){ + for(let i = 0; i < userTeamsList.length; i++){ + userTms.push({ + "teamId": userTeamsIdsList[i], + "teamDisplayName": userTeamsList[i], + }) + } } + Users.update(this.userId, { $set:{ teams: userTms @@ -566,12 +569,15 @@ Template.editUserPopup.events({ let userOrgsList = userOrgs.split(","); let userOrgsIdsList = userOrgsIds.split(","); let userOrganizations = []; - for(let i = 0; i < userOrgsList.length; i++){ - userOrganizations.push({ - "orgId": userOrgsIdsList[i], - "orgDisplayName": userOrgsList[i], - }) + if(userOrgs != ''){ + for(let i = 0; i < userOrgsList.length; i++){ + userOrganizations.push({ + "orgId": userOrgsIdsList[i], + "orgDisplayName": userOrgsList[i], + }) + } } + Users.update(this.userId, { $set:{ orgs: userOrganizations @@ -724,7 +730,7 @@ UpdateUserOrgsOrTeamsElement = function(isNewUser = false){ lstInputValuesIds = []; } index = lstInputValues.indexOf(selectedEltValue); - indexId = lstInputValuesIds.indexOf(selectedEltValue); + indexId = lstInputValuesIds.indexOf(selectedEltValueId); if(userOrgsTeamsAction == "addOrg" || userOrgsTeamsAction == "addTeam"){ if(index <= -1 && selectedEltValueId != "-1"){ lstInputValues.push(selectedEltValue); @@ -923,6 +929,16 @@ Template.newUserPopup.events({ Template.settingsOrgPopup.events({ 'click #deleteButton'(event) { event.preventDefault(); + if(Users.find({"orgs.orgId": this.orgId}).count() > 0) + { + let orgClassList = document.getElementById("deleteOrgWarningMessage").classList; + if(orgClassList.contains('hide')) + { + orgClassList.remove('hide'); + document.getElementById("deleteOrgWarningMessage").style.color = "red"; + } + return; + } Org.remove(this.orgId); Popup.close(); } @@ -931,6 +947,16 @@ Template.settingsOrgPopup.events({ Template.settingsTeamPopup.events({ 'click #deleteButton'(event) { event.preventDefault(); + if(Users.find({"teams.teamId": this.teamId}).count() > 0) + { + let teamClassList = document.getElementById("deleteTeamWarningMessage").classList; + if(teamClassList.contains('hide')) + { + teamClassList.remove('hide'); + document.getElementById("deleteTeamWarningMessage").style.color = "red"; + } + return; + } Team.remove(this.teamId); Popup.close(); } diff --git a/i18n/ar-EG.i18n.json b/i18n/ar-EG.i18n.json index 657defbaf..9ef52fe39 100644 --- a/i18n/ar-EG.i18n.json +++ b/i18n/ar-EG.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index 709fad351..460d0a3af 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json index cf449eb44..291d4cf92 100644 --- a/i18n/bg.i18n.json +++ b/i18n/bg.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json index f988ac022..c8c7c3582 100644 --- a/i18n/br.i18n.json +++ b/i18n/br.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index f6186f0f8..373aeb0ad 100644 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index 252f0759f..b82ad11b1 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximalizovat kartu", - "minimize-card": "Minimalizovat kartu" -} \ No newline at end of file + "minimize-card": "Minimalizovat kartu", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/da.i18n.json b/i18n/da.i18n.json index b8f79ee78..9fa5fdb6d 100644 --- a/i18n/da.i18n.json +++ b/i18n/da.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/de-CH.i18n.json b/i18n/de-CH.i18n.json index edacd903c..f19f60127 100644 --- a/i18n/de-CH.i18n.json +++ b/i18n/de-CH.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Karte maximieren", - "minimize-card": "Karte minimieren" -} \ No newline at end of file + "minimize-card": "Karte minimieren", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 21ce7e0cd..5ec558cb6 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout-Warte-Symbol", "Wave": "Wellen-Warte-Symbol", "maximize-card": "Karte maximieren", - "minimize-card": "Karte minimieren" -} \ No newline at end of file + "minimize-card": "Karte minimieren", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json index abfa68508..44e8f8efb 100644 --- a/i18n/el.i18n.json +++ b/i18n/el.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json index af2a7d2e3..cdb42f63e 100644 --- a/i18n/en-GB.i18n.json +++ b/i18n/en-GB.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index d659ed34f..facd0a31a 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -1054,5 +1054,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" } diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json index 44f06172f..153a6deb6 100644 --- a/i18n/eo.i18n.json +++ b/i18n/eo.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json index 4a101c341..1c40d8e84 100644 --- a/i18n/es-AR.i18n.json +++ b/i18n/es-AR.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/es-CL.i18n.json b/i18n/es-CL.i18n.json index 3513423fd..3ac377c65 100644 --- a/i18n/es-CL.i18n.json +++ b/i18n/es-CL.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/es-LA.i18n.json b/i18n/es-LA.i18n.json index 657defbaf..9ef52fe39 100644 --- a/i18n/es-LA.i18n.json +++ b/i18n/es-LA.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/es-MX.i18n.json b/i18n/es-MX.i18n.json index 3222a6c0a..e2c91dc9a 100644 --- a/i18n/es-MX.i18n.json +++ b/i18n/es-MX.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/es-PE.i18n.json b/i18n/es-PE.i18n.json index 09f4482c5..4c2c07176 100644 --- a/i18n/es-PE.i18n.json +++ b/i18n/es-PE.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/es-PY.i18n.json b/i18n/es-PY.i18n.json index 657defbaf..9ef52fe39 100644 --- a/i18n/es-PY.i18n.json +++ b/i18n/es-PY.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index 416d7980f..fd27f2427 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json index 65427fb81..0c473d418 100644 --- a/i18n/eu.i18n.json +++ b/i18n/eu.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/fa-IR.i18n.json b/i18n/fa-IR.i18n.json index 6788a20a1..221c25527 100644 --- a/i18n/fa-IR.i18n.json +++ b/i18n/fa-IR.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index 7b5aa3033..9c4dee1f8 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index 1b2953678..06e0cd76e 100644 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Skaalaus ulos odotus pyörijä", "Wave": "Aalto odotus pyörijä", "maximize-card": "Suurenna kortti", - "minimize-card": "Pienennä kortti" -} \ No newline at end of file + "minimize-card": "Pienennä kortti", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index e244470bd..12d3bbea0 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Icône d'attente mise à l'échelle", "Wave": "Icône d'attente onde", "maximize-card": "Maximiser la carte", - "minimize-card": "Minimiser la carte" -} \ No newline at end of file + "minimize-card": "Minimiser la carte", + "delete-org-warning-message": "Impossible de supprimer cette organisation, il y a au moins un utilisateur qui appartient à cette organisation", + "delete-team-warning-message": "Impossible de supprimer cette équipe, il y a au moins un utilisateur qui appartient à cette équipe" +} diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json index 3e9b54d5f..4db0b6ca1 100644 --- a/i18n/gl.i18n.json +++ b/i18n/gl.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index 845220533..bd1032f00 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "שבשבת המתנה התרחקות", "Wave": "שבשבת המתנה גל", "maximize-card": "הגדלת כרטיס", - "minimize-card": "מזעור כרטיס" -} \ No newline at end of file + "minimize-card": "מזעור כרטיס", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/hi.i18n.json b/i18n/hi.i18n.json index 263553622..05a0f945e 100644 --- a/i18n/hi.i18n.json +++ b/i18n/hi.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/hr.i18n.json b/i18n/hr.i18n.json index 1d3b1e376..5add4161e 100644 --- a/i18n/hr.i18n.json +++ b/i18n/hr.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json index 20b03e9eb..60179289f 100644 --- a/i18n/hu.i18n.json +++ b/i18n/hu.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json index a582f9531..53432aeda 100644 --- a/i18n/hy.i18n.json +++ b/i18n/hy.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json index 6bebf0bc3..f222a97e5 100644 --- a/i18n/id.i18n.json +++ b/i18n/id.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json index 692bbd7a1..6f9dc48d6 100644 --- a/i18n/ig.i18n.json +++ b/i18n/ig.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index b41a159fe..c812b08cb 100644 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index 291f8f1ba..2a90efee6 100644 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/ka.i18n.json b/i18n/ka.i18n.json index 92c470a50..658bcd764 100644 --- a/i18n/ka.i18n.json +++ b/i18n/ka.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/km.i18n.json b/i18n/km.i18n.json index 7fb57c43c..1f46ae99d 100644 --- a/i18n/km.i18n.json +++ b/i18n/km.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index b000f6ee0..4769fa2d6 100644 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/lt.i18n.json b/i18n/lt.i18n.json index 657defbaf..9ef52fe39 100644 --- a/i18n/lt.i18n.json +++ b/i18n/lt.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json index 0509fef5b..07cb5a148 100644 --- a/i18n/lv.i18n.json +++ b/i18n/lv.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/mk.i18n.json b/i18n/mk.i18n.json index e26d5e93d..843bd806c 100644 --- a/i18n/mk.i18n.json +++ b/i18n/mk.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json index b5135656d..00041ebec 100644 --- a/i18n/mn.i18n.json +++ b/i18n/mn.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json index 418fe6182..c8e5c5b28 100644 --- a/i18n/nb.i18n.json +++ b/i18n/nb.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Ventehjul - Utskaliering", "Wave": "Ventehjul - Bølge", "maximize-card": "Maksimer Kort", - "minimize-card": "Minimer Kort" -} \ No newline at end of file + "minimize-card": "Minimer Kort", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index f0d726bf5..69f6f8e3e 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Vergrotende Wacht Spinner", "Wave": "Golvende Wacht Spinner", "maximize-card": "Maximaliseer Kaart", - "minimize-card": "Minimaliseer Kaart" -} \ No newline at end of file + "minimize-card": "Minimaliseer Kaart", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/oc.i18n.json b/i18n/oc.i18n.json index 99f80ad72..9a6ff9260 100644 --- a/i18n/oc.i18n.json +++ b/i18n/oc.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/pa.i18n.json b/i18n/pa.i18n.json index 657defbaf..9ef52fe39 100644 --- a/i18n/pa.i18n.json +++ b/i18n/pa.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 85e37d3fb..b192553fb 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 474306caf..2b3681b37 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximizar Cartão", - "minimize-card": "Minimizar Cartão" -} \ No newline at end of file + "minimize-card": "Minimizar Cartão", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json index 84b301242..f0f50a866 100644 --- a/i18n/pt.i18n.json +++ b/i18n/pt.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json index 3c0a44dc5..7bb11cbfe 100644 --- a/i18n/ro.i18n.json +++ b/i18n/ro.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index 83bd4b382..4448d9508 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Увеличивающийся-уменьшающийся спиннер", "Wave": "Волновой спиннер", "maximize-card": "Максимизировать карточку", - "minimize-card": "Минимизировать карточку" -} \ No newline at end of file + "minimize-card": "Минимизировать карточку", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/sk.i18n.json b/i18n/sk.i18n.json index e2d83bf28..2abbad846 100644 --- a/i18n/sk.i18n.json +++ b/i18n/sk.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/sl.i18n.json b/i18n/sl.i18n.json index 7e6064918..e9ff70837 100644 --- a/i18n/sl.i18n.json +++ b/i18n/sl.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json index 4f0d9b6d5..1c494890e 100644 --- a/i18n/sr.i18n.json +++ b/i18n/sr.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index 7b99b9352..9454e116e 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/sw.i18n.json b/i18n/sw.i18n.json index 6100ba4ee..00af3bcf6 100644 --- a/i18n/sw.i18n.json +++ b/i18n/sw.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json index cf54d830f..2fa2e9800 100644 --- a/i18n/ta.i18n.json +++ b/i18n/ta.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json index 295490dc5..62f8e9e8d 100644 --- a/i18n/th.i18n.json +++ b/i18n/th.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index b44dc8002..af8c896ba 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json index 2d9fdcc9d..18e51812a 100644 --- a/i18n/uk.i18n.json +++ b/i18n/uk.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json index 43da1e121..9ab06a66e 100644 --- a/i18n/vi.i18n.json +++ b/i18n/vi.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index 512c8525a..f12029557 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/zh-HK.i18n.json b/i18n/zh-HK.i18n.json index 8c75d1ec8..9b6e0982f 100644 --- a/i18n/zh-HK.i18n.json +++ b/i18n/zh-HK.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index a99319d35..4125f851d 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -1053,5 +1053,7 @@ "Scaleout": "Scaleout Wait Spinner", "Wave": "Wave Wait Spinner", "maximize-card": "Maximize Card", - "minimize-card": "Minimize Card" -} \ No newline at end of file + "minimize-card": "Minimize Card", + "delete-org-warning-message": "Can not delete this organization, there is at least one user belongs to is", + "delete-team-warning-message": "Can not delete this team, there is at least one user belongs to is" +} diff --git a/models/org.js b/models/org.js index a4ffffd80..8efa9b64b 100644 --- a/models/org.js +++ b/models/org.js @@ -113,6 +113,7 @@ if (Meteor.isServer) { fetch: [], }); + Meteor.methods({ setCreateOrg( orgDisplayName,