Organization categories not available until the repo is ready

Author: tamu-sad-iii

src/main/webapp/app/controllers/sidebar/organizationSideBarController.js

@@ -10,62 +10,64 @@ vireo.controller("OrganizationSideBarController", function ($controller, $scope,
 
     var organizationCategories = OrganizationCategoryRepo.getAll();
 
+    $scope.forms = {};
+
     $scope.ready = $q.all([
         OrganizationCategoryRepo.ready()
     ]);
 
-    $scope.forms = {};
+    $scope.ready.then(function () {
+        $scope.organizationCategories = organizationCategories.filter(function (category) {
+            return !!category && category.name !== 'System';
+        });
 
-    $scope.organizationCategories = organizationCategories.filter(function (category) {
-        return !!category && category.name !== 'System';
-    });
+        $scope.reset = function () {
+            $scope.organizationRepo.clearValidationResults();
+
+            for (var key in $scope.forms) {
+                if ($scope.forms[key] !== undefined && !$scope.forms[key].$pristine) {
+                    $scope.forms[key].$setPristine();
+                    $scope.forms[key].$setUntouched();
+                }
+            }
 
-    $scope.reset = function () {
-        $scope.organizationRepo.clearValidationResults();
+            $scope.newOrganization = OrganizationRepo.resetNewOrganization();
 
-        for (var key in $scope.forms) {
-            if ($scope.forms[key] !== undefined && !$scope.forms[key].$pristine) {
-                $scope.forms[key].$setPristine();
-                $scope.forms[key].$setUntouched();
+            if ($scope.newOrganization.category === undefined) {
+                $scope.newOrganization.category = $scope.organizationCategories[0];
             }
-        }
-
-        $scope.newOrganization = OrganizationRepo.resetNewOrganization();
-
-        if ($scope.newOrganization.category === undefined) {
-            $scope.newOrganization.category = $scope.organizationCategories[0];
-        }
-
-        if ($scope.newOrganization.parent === undefined) {
-            $scope.newOrganization.parent = $scope.organizations[0];
-        }
-    };
-
-    $scope.createNewOrganization = function (hierarchical) {
-        $scope.creatingNewOrganization = true;
-        var parentOrganization = hierarchical === 'true' ? OrganizationRepo.newOrganization.parent : $scope.organizations[0];
-        OrganizationRepo.create({
-            "name": OrganizationRepo.newOrganization.name,
-            "category": OrganizationRepo.newOrganization.category,
-            "parentOrganization": {
-                "id": parentOrganization.id,
-                "name": parentOrganization.name,
-                "category": parentOrganization.category
+
+            if ($scope.newOrganization.parent === undefined) {
+                $scope.newOrganization.parent = $scope.organizations[0];
+            }
+        };
+
+        $scope.createNewOrganization = function (hierarchical) {
+            $scope.creatingNewOrganization = true;
+            var parentOrganization = hierarchical === 'true' ? OrganizationRepo.newOrganization.parent : $scope.organizations[0];
+            OrganizationRepo.create({
+                "name": OrganizationRepo.newOrganization.name,
+                "category": OrganizationRepo.newOrganization.category,
+                "parentOrganization": {
+                    "id": parentOrganization.id,
+                    "name": parentOrganization.name,
+                    "category": parentOrganization.category
+                }
+            }, parentOrganization).then(function () {
+                $scope.creatingNewOrganization = false;
+                $scope.reset();
+            });
+        };
+
+        OrganizationRepo.getAllSpecific('tree').then(function (orgs) {
+            $scope.organizations.length = 0;
+
+            if (!!orgs && orgs.length > 0) {
+                angular.extend($scope.organizations, orgs);
             }
-        }, parentOrganization).then(function () {
-            $scope.creatingNewOrganization = false;
+
             $scope.reset();
         });
-    };
-
-    OrganizationRepo.getAllSpecific('tree').then(function (orgs) {
-        $scope.organizations.length = 0;
-
-        if (!!orgs && orgs.length > 0) {
-            angular.extend($scope.organizations, orgs);
-        }
-
-        $scope.reset();
     });
 
 });