updating feature checks

ushahidi · Mar 11, 2016 · 8c00079 · 8c00079
1 parent b99be4b
commit 8c00079
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/app/common/global/language-settings.js b/app/common/global/language-settings.js
@@ -2,14 +2,16 @@ module.exports = [
     '$rootScope',
     '$translate',
     'ConfigEndpoint',
+    'BootstrapConfig',
     'Languages',
 function (
     $rootScope,
     $translate,
     ConfigEndpoint,
+    BootstrapConfig,
     Languages
 ) {
-    var lang = 'en-US';
+    var lang = BootstrapConfig.language || 'en-US';
 
     ConfigEndpoint.get({ id: 'site' }).$promise.then(function (site) {
         lang = site.language ? site.language : 'en-US';

diff --git a/app/setting/controllers/setting-datasources-controller.js b/app/setting/controllers/setting-datasources-controller.js
@@ -90,5 +90,7 @@ function (
         });
     });
 
-    $scope.available_providers = Features.clientFeatures['data-providers'];
+    Features.loadFeatures().then(function (features) {
+        $scope.available_providers = features['data-providers'];
+    });
 }];
diff --git a/app/setting/controllers/setting-forms-controller.js b/app/setting/controllers/setting-forms-controller.js
@@ -19,7 +19,9 @@ function (
     _,
     Features
 ) {
-    $scope.formQuota = Features.getLimit('forms');
+    Features.loadFeatures().then(function () {
+        $scope.formQuota = Features.getLimit('forms');
+    });
 
     $translate('nav.posts_and_entities').then(function (title) {
         $scope.title = title;

diff --git a/app/setting/directives/setting-data-import-directive.js b/app/setting/directives/setting-data-import-directive.js
@@ -17,9 +17,9 @@ function (
         restrict: 'A',
         link: function ($scope, $element, $attrs) {
             $scope.formId;
-
-            $scope.csvEnabled = Features.isFeatureEnabled('data-import');
-
+            Features.loadFeatures().then(function () {
+                $scope.csvEnabled = Features.isFeatureEnabled('data-import');
+            });
             $scope.importCSV = function () {
                 if (!$scope.fileContainer.file) {
                     $translate('notify.data_import.file_missing').then(function (message) {

diff --git a/app/setting/directives/setting-editor-directive.js b/app/setting/directives/setting-editor-directive.js
@@ -34,8 +34,9 @@ function (
             $scope.fileContainer = {
                 file : null
             };
-
-            $scope.isPrivateEnabled = Features.isFeatureEnabled('private');
+            Features.loadFeatures().then(function () {
+                $scope.isPrivateEnabled = Features.isFeatureEnabled('private');
+            });
 
             $scope.site = ConfigEndpoint.get({ id: 'site' });
             $scope.userSavedSettings = false;

diff --git a/app/setting/directives/setting-roles-directive.js b/app/setting/directives/setting-roles-directive.js
@@ -27,9 +27,9 @@ function (
             };
 
             $scope.refreshView();
-
-            $scope.rolesEnabled = Features.isFeatureEnabled('roles');
-
+            Features.loadFeatures().then(function () {
+                $scope.rolesEnabled = Features.isFeatureEnabled('roles');
+            });
             $scope.checkIfLastAdmin = function () {
                 var admins = 0;
                 _.each($scope.roles, function (role) {