Merge pull request #572 from pipermerriam/piper/issue-560-use-organiz…

…ation-context-for-label-endpoints

Handle users with multiple organizations correctly with labels

seed/static/seed/js/controllers/menu_controller.js

@@ -339,6 +339,7 @@ angular.module('BE.seed.controller.menu', [])
         organization_service.get_organizations().then(function (data) {
             // resolve promise
             $scope.organizations_count = data.organizations.length;
+            $scope.menu.user.organizations = data.organizations;
         });
     };
     init();

seed/static/seed/js/services/label_service.js

@@ -100,7 +100,10 @@ angular.module('BE.seed.service.label',
         $http({
             method: 'POST',
             'url': window.BE.urls.label_list,
-            'data': label
+            'data': label,
+            'params': {
+                'organization_id': user_service.get_organization().id
+            }
         }).success(function(data, status, headers, config) {
             if(data){
                 data = update_label_w_local_props(data);
@@ -129,6 +132,9 @@ angular.module('BE.seed.service.label',
             method: 'PUT',
             'url': window.BE.urls.label_list + label.id + '/',
             'data': label,
+            'params': {
+                'organization_id': user_service.get_organization().id
+            }
         }).success(function(data, status, headers, config) {
             if(data){
                 data = update_label_w_local_props(data);
@@ -153,6 +159,9 @@ angular.module('BE.seed.service.label',
         $http({
             method: 'DELETE',
             'url': window.BE.urls.label_list + label.id + '/',
+            'params': {
+                'organization_id': user_service.get_organization().id
+            }
         }).success(function(data, status, headers, config) {
             defer.resolve(data);
         }).error(function(data, status, headers, config) {
@@ -188,7 +197,8 @@ angular.module('BE.seed.service.label',
             'url': window.BE.urls.update_building_labels,
             'params': _.extend({
                 'selected_buildings' : selected_buildings,
-                'select_all_checkbox': select_all_checkbox
+                'select_all_checkbox': select_all_checkbox,
+                'organization_id': user_service.get_organization().id
             }, search_params),
             'data': {
                 'add_label_ids': add_label_ids,

seed/views/labels.py

@@ -1,3 +1,5 @@
+from django.core.exceptions import ObjectDoesNotExist
+
 from rest_framework import viewsets
 from rest_framework import generics
 from rest_framework import response
@@ -29,13 +31,25 @@ class LabelViewSet(DecoratorMixin(drf_api_endpoint),
     queryset = Label.objects.none()
     filter_backends = (LabelFilterBackend,)
 
+    _organization = None
+
+    def get_organization(self):
+        if self._organization is None:
+            try:
+                self._organization = self.request.user.orgs.get(
+                    pk=self.request.query_params["organization_id"],
+                )
+            except (KeyError, ObjectDoesNotExist):
+                self._organization = self.request.user.orgs.all()[0]
+        return self._organization
+
     def get_queryset(self):
         return Label.objects.filter(
-            super_organization__in=self.request.user.orgs.all()
+            super_organization=self.get_organization()
         ).order_by("name").distinct()
 
     def get_serializer(self, *args, **kwargs):
-        kwargs['super_organization'] = self.request.user.orgs.first()
+        kwargs['super_organization'] = self.get_organization()
         building_snapshots = BuildingFilterBackend().filter_queryset(
             request=self.request,
             queryset=BuildingSnapshot.objects.all(),
@@ -50,6 +64,18 @@ class UpdateBuildingLabelsAPIView(generics.GenericAPIView):
     queryset = BuildingSnapshot.objects.all()
     serializer_class = UpdateBuildingLabelsSerializer
 
+    _organization = None
+
+    def get_organization(self):
+        if self._organization is None:
+            try:
+                self._organization = self.request.user.orgs.get(
+                    pk=self.request.query_params["organization_id"],
+                )
+            except ObjectDoesNotExist:
+                self._organization = self.request.user.orgs.all()[0]
+        return self._organization
+
     def put(self, *args, **kwargs):
         """
         Updates label assignments to buildings.
@@ -81,7 +107,7 @@ def put(self, *args, **kwargs):
         serializer = self.get_serializer(
             data=self.request.data,
             queryset=queryset,
-            super_organization=self.request.user.orgs.first(),
+            super_organization=self.get_organization(),
         )
         serializer.is_valid(raise_exception=True)