Merge pull request #220 from SEED-platform/revert-219-9-loading-indic…

…ator Revert "Issue #9 - Mapping page loading indicator "
SEED-platform · Apr 28, 2015 · a96f2f9 · a96f2f9
2 parents ed5fc3b + 453f9a4
commit a96f2f9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/seed/static/seed/js/controllers/menu_controller.js b/seed/static/seed/js/controllers/menu_controller.js
@@ -50,22 +50,16 @@ angular.module('BE.seed.controller.menu', [])
     $scope.menu.create_project_error = false;
     $scope.menu.create_project_error_message = "";
     $scope.saving_indicator = false;
-    $scope.menu.loading = false;
     $scope.menu.route_load_error = false;
     $scope.menu.user = {};
 
     $scope.$on("$routeChangeError", function(event, current, previous, rejection) {
-        $scope.menu.loading = false;
         $scope.menu.route_load_error = true;
         if (rejection === "not authorized" || rejection === "Your page could not be located!") {
             $scope.menu.error_message = rejection;
         }
     });
-    $scope.$on("$routeChangeStart", function($event, next, current) {
-        $scope.menu.loading = next.controller === "mapping_controller";
-    })
     $scope.$on("$routeChangeSuccess", function() {
-        $scope.menu.loading = false;
         $scope.menu.route_load_error = false;
     });
     $scope.$on('app_error', function(event, data){

diff --git a/seed/templates/seed/index.html b/seed/templates/seed/index.html
@@ -20,8 +20,7 @@
                         {$ menu.error_message || 'There was an error loading the page' $}
                     </div>
                 </div>
-                <div class="section_tab_container" ng-show="menu.loading"><p>Please wait while your data is loaded...</p></div>
-                <div ng-hide="menu.loading" data-ng-view="" id="ng-view"></div>
+                <div data-ng-view="" id="ng-view"></div>
             </div>
 
             {% include "seed/_footer.html" %}

diff --git a/seed/views/main.py b/seed/views/main.py
@@ -1147,15 +1147,15 @@ def get_column_mapping_suggestions(request):
     field_mappings = get_mappable_types()
     field_names = field_mappings.keys()
     column_types = {}
-
-    # Note on exclude:
-    # mappings get created to mappable types but we deal with them manually
-    # so don't include them here
-    columns = Column.objects.select_related('unit').prefetch_related('schemas') \
-        .filter(Q(mapped_mappings__super_organization=org_id) | Q(organization__isnull=True)) \
-        .exclude(column_name__in=field_names)
-
-    for c in columns:
+    for c in Column.objects.filter(
+        Q(mapped_mappings__super_organization=org_id) |
+        Q(organization__isnull=True)
+    ).exclude(
+        # mappings get created to mappable types
+        # but we deal with them manually so don't
+        # include them here
+        column_name__in=field_names
+    ):
         if c.unit:
             unit = c.unit.get_unit_type_display()
         else: