Browse Source

Merge pull request #3865 from Emile840/master

Added some controls and warning messages when user try to delete an organization or team that has at least one user belongs to it
Lauri Ojansivu 4 years ago
parent
commit
80adca5134
67 changed files with 299 additions and 138 deletions
  1. 6 0
      client/components/settings/peopleBody.jade
  2. 37 11
      client/components/settings/peopleBody.js
  3. 4 2
      i18n/ar-EG.i18n.json
  4. 4 2
      i18n/ar.i18n.json
  5. 4 2
      i18n/bg.i18n.json
  6. 4 2
      i18n/br.i18n.json
  7. 4 2
      i18n/ca.i18n.json
  8. 4 2
      i18n/cs.i18n.json
  9. 4 2
      i18n/da.i18n.json
  10. 4 2
      i18n/de-CH.i18n.json
  11. 4 2
      i18n/de.i18n.json
  12. 4 2
      i18n/el.i18n.json
  13. 4 2
      i18n/en-GB.i18n.json
  14. 3 1
      i18n/en.i18n.json
  15. 4 2
      i18n/eo.i18n.json
  16. 4 2
      i18n/es-AR.i18n.json
  17. 4 2
      i18n/es-CL.i18n.json
  18. 4 2
      i18n/es-LA.i18n.json
  19. 4 2
      i18n/es-MX.i18n.json
  20. 4 2
      i18n/es-PE.i18n.json
  21. 4 2
      i18n/es-PY.i18n.json
  22. 4 2
      i18n/es.i18n.json
  23. 4 2
      i18n/eu.i18n.json
  24. 4 2
      i18n/fa-IR.i18n.json
  25. 4 2
      i18n/fa.i18n.json
  26. 4 2
      i18n/fi.i18n.json
  27. 4 2
      i18n/fr.i18n.json
  28. 4 2
      i18n/gl.i18n.json
  29. 4 2
      i18n/he.i18n.json
  30. 4 2
      i18n/hi.i18n.json
  31. 4 2
      i18n/hr.i18n.json
  32. 4 2
      i18n/hu.i18n.json
  33. 4 2
      i18n/hy.i18n.json
  34. 4 2
      i18n/id.i18n.json
  35. 4 2
      i18n/ig.i18n.json
  36. 4 2
      i18n/it.i18n.json
  37. 4 2
      i18n/ja.i18n.json
  38. 4 2
      i18n/ka.i18n.json
  39. 4 2
      i18n/km.i18n.json
  40. 4 2
      i18n/ko.i18n.json
  41. 4 2
      i18n/lt.i18n.json
  42. 4 2
      i18n/lv.i18n.json
  43. 4 2
      i18n/mk.i18n.json
  44. 4 2
      i18n/mn.i18n.json
  45. 4 2
      i18n/nb.i18n.json
  46. 4 2
      i18n/nl.i18n.json
  47. 4 2
      i18n/oc.i18n.json
  48. 4 2
      i18n/pa.i18n.json
  49. 4 2
      i18n/pl.i18n.json
  50. 4 2
      i18n/pt-BR.i18n.json
  51. 4 2
      i18n/pt.i18n.json
  52. 4 2
      i18n/ro.i18n.json
  53. 4 2
      i18n/ru.i18n.json
  54. 4 2
      i18n/sk.i18n.json
  55. 4 2
      i18n/sl.i18n.json
  56. 4 2
      i18n/sr.i18n.json
  57. 4 2
      i18n/sv.i18n.json
  58. 4 2
      i18n/sw.i18n.json
  59. 4 2
      i18n/ta.i18n.json
  60. 4 2
      i18n/th.i18n.json
  61. 4 2
      i18n/tr.i18n.json
  62. 4 2
      i18n/uk.i18n.json
  63. 4 2
      i18n/vi.i18n.json
  64. 4 2
      i18n/zh-CN.i18n.json
  65. 4 2
      i18n/zh-HK.i18n.json
  66. 4 2
      i18n/zh-TW.i18n.json
  67. 1 0
      models/org.js

+ 6 - 0
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

+ 37 - 11
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();
   }

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
i18n/ar.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/bg.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/br.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/ca.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/cs.i18n.json

@@ -1053,5 +1053,7 @@
     "Scaleout": "Scaleout Wait Spinner",
     "Wave": "Wave Wait Spinner",
     "maximize-card": "Maximalizovat kartu",
-    "minimize-card": "Minimalizovat kartu"
-}
+    "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"
+}

+ 4 - 2
i18n/da.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
i18n/de.i18n.json

@@ -1053,5 +1053,7 @@
     "Scaleout": "Scaleout-Warte-Symbol",
     "Wave": "Wellen-Warte-Symbol",
     "maximize-card": "Karte maximieren",
-    "minimize-card": "Karte minimieren"
-}
+    "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"
+}

+ 4 - 2
i18n/el.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 3 - 1
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"
 }

+ 4 - 2
i18n/eo.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
i18n/es.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/eu.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
i18n/fa.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
i18n/gl.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/he.i18n.json

@@ -1053,5 +1053,7 @@
     "Scaleout": "שבשבת המתנה התרחקות",
     "Wave": "שבשבת המתנה גל",
     "maximize-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"
+}

+ 4 - 2
i18n/hi.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/hr.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/hu.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/hy.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/id.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/ig.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/it.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/ja.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/ka.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/km.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/ko.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/lt.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/lv.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/mk.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/mn.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/nb.i18n.json

@@ -1053,5 +1053,7 @@
     "Scaleout": "Ventehjul - Utskaliering",
     "Wave": "Ventehjul - Bølge",
     "maximize-card": "Maksimer Kort",
-    "minimize-card": "Minimer Kort"
-}
+    "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"
+}

+ 4 - 2
i18n/nl.i18n.json

@@ -1053,5 +1053,7 @@
     "Scaleout": "Vergrotende Wacht Spinner",
     "Wave": "Golvende Wacht Spinner",
     "maximize-card": "Maximaliseer Kaart",
-    "minimize-card": "Minimaliseer Kaart"
-}
+    "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"
+}

+ 4 - 2
i18n/oc.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/pa.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/pl.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
i18n/pt.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/ro.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/ru.i18n.json

@@ -1053,5 +1053,7 @@
     "Scaleout": "Увеличивающийся-уменьшающийся спиннер",
     "Wave": "Волновой спиннер",
     "maximize-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"
+}

+ 4 - 2
i18n/sk.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/sl.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/sr.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/sv.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/sw.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/ta.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/th.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/tr.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/uk.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
i18n/vi.i18n.json

@@ -1053,5 +1053,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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 4 - 2
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"
-}
+    "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"
+}

+ 1 - 0
models/org.js

@@ -113,6 +113,7 @@ if (Meteor.isServer) {
     fetch: [],
   });
 
+
   Meteor.methods({
     setCreateOrg(
       orgDisplayName,