fix weird behavior where freshly created teams/orgs as active are crossed, recreated consistency with database

client/components/settings/peopleBody.jade

@@ -148,30 +148,30 @@ template(name="newUserRow")
 template(name="orgRow")
   tr
     if orgData.orgIsActive
-      td <s>{{ orgData.orgDisplayName }}</s>
-    else
       td {{ orgData.orgDisplayName }}
-    if orgData.orgIsActive
-      td <s>{{ orgData.orgDesc }}</s>
     else
-      td {{ orgData.orgDesc }}
+      td <s>{{ orgData.orgDisplayName }}</s>
     if orgData.orgIsActive
-      td <s>{{ orgData.orgShortName }}</s>
+      td {{ orgData.orgDesc }}
     else
-      td {{ orgData.orgShortName }}
+      td <s>{{ orgData.orgDesc }}</s>
     if orgData.orgIsActive
-      td <s>{{ orgData.orgWebsite }}</s>
+      td {{ orgData.orgShortName }}
     else
-      td {{ orgData.orgWebsite }}
+      td <s>{{ orgData.orgShortName }}</s>
     if orgData.orgIsActive
-      td <s>{{ moment orgData.createdAt 'LLL' }}</s>
+      td {{ orgData.orgWebsite }}
     else
+      td <s>{{ orgData.orgWebsite }}</s>
+    if orgData.orgIsActive
       td {{ moment orgData.createdAt 'LLL' }}
+    else
+      td <s>{{ moment orgData.createdAt 'LLL' }}</s>
     td
       if orgData.orgIsActive
-        | {{_ 'no'}}
-      else
         | {{_ 'yes'}}
+      else
+        | {{_ 'no'}}
     td
       a.edit-org
         i.fa.fa-edit
@@ -182,30 +182,30 @@ template(name="orgRow")
 template(name="teamRow")
   tr
     if teamData.teamIsActive
-      td <s>{{ teamData.teamDisplayName }}</s>
-    else
       td {{ teamData.teamDisplayName }}
-    if teamData.teamIsActive
-      td <s>{{ teamData.teamDesc }}</s>
     else
-      td {{ teamData.teamDesc }}
+      td <s>{{ teamData.teamDisplayName }}</s>
     if teamData.teamIsActive
-      td <s>{{ teamData.teamShortName }}</s>
+      td {{ teamData.teamDesc }}
     else
-      td {{ teamData.teamShortName }}
+      td <s>{{ teamData.teamDesc }}</s>
     if teamData.teamIsActive
-      td <s>{{ teamData.teamWebsite }}</s>
+      td {{ teamData.teamShortName }}
     else
-      td {{ teamData.teamWebsite }}
+      td <s>{{ teamData.teamShortName }}</s>
     if teamData.teamIsActive
-      td <s>{{ moment teamData.createdAt 'LLL' }}</s>
+      td {{ teamData.teamWebsite }}
     else
+      td <s>{{ teamData.teamWebsite }}</s>
+    if teamData.teamIsActive
       td {{ moment teamData.createdAt 'LLL' }}
+    else
+      td <s>{{ moment teamData.createdAt 'LLL' }}</s>
     td
       if teamData.teamIsActive
-        | {{_ 'no'}}
-      else
         | {{_ 'yes'}}
+      else
+        | {{_ 'no'}}
     td
       a.edit-team
         i.fa.fa-edit
@@ -313,8 +313,8 @@ template(name="editOrgPopup")
     label
       | {{_ 'active'}}
       select.select-active.js-org-isactive
-        option(value="false") {{_ 'yes'}}
-        option(value="true" selected="{{org.orgIsActive}}") {{_ 'no'}}
+        option(value="false") {{_ 'no'}}
+        option(value="true" selected="{{org.orgIsActive}}") {{_ 'yes'}}
     hr
     div.buttonsContainer
       input.primary.wide(type="submit" value="{{_ 'save'}}")
@@ -339,8 +339,8 @@ template(name="editTeamPopup")
     label
       | {{_ 'active'}}
       select.select-active.js-team-isactive
-        option(value="false") {{_ 'yes'}}
-        option(value="true" selected="{{team.teamIsActive}}") {{_ 'no'}}
+        option(value="false") {{_ 'no'}}
+        option(value="true" selected="{{team.teamIsActive}}") {{_ 'yes'}}
     hr
     div.buttonsContainer
       input.primary.wide(type="submit" value="{{_ 'save'}}")
@@ -442,8 +442,8 @@ template(name="newOrgPopup")
     label
       | {{_ 'active'}}
       select.select-active.js-org-isactive
-        option(value="false" selected="selected") {{_ 'yes'}}
-        option(value="true") {{_ 'no'}}
+        option(value="false" selected="selected") {{_ 'no'}}
+        option(value="true") {{_ 'yes'}}
     hr
     div.buttonsContainer
       input.primary.wide(type="submit" value="{{_ 'save'}}")
@@ -466,8 +466,8 @@ template(name="newTeamPopup")
     label
       | {{_ 'active'}}
       select.select-active.js-team-isactive
-        option(value="false" selected="selected") {{_ 'yes'}}
-        option(value="true") {{_ 'no'}}
+        option(value="false" selected="selected") {{_ 'no'}}
+        option(value="true") {{_ 'yes'}}
     hr
     div.buttonsContainer
       input.primary.wide(type="submit" value="{{_ 'save'}}")