commit 589e6c4b53e4b3bd9d772644eecf8473612c347c
author Scott Baker <smbaker@gmail.com> Thu May 25 16:55:18 2017 -0700
committer Scott Baker <smbaker@gmail.com> Thu May 25 17:20:07 2017 -0700
tree 5a7c83f5d8fb2a2a7f6789a393d03c5df26820ad
parent a45f7c9503621d472cb23e92eb7952a3730a0a45

CORD-1244 cleanup use of get_tenant/get_service

Change-Id: Iae02c3d73d64a105dadade3e64f73cad885c34fa

xos/admin.py

diff --git a/xos/admin.py b/xos/admin.py
index 829f7f1..d6745eb 100644
--- a/xos/admin.py
+++ b/xos/admin.py
@@ -57,7 +57,7 @@
         )
 
     def get_queryset(self, request):
-        return ExampleService.get_service_objects_by_user(request.user)
+        return ExampleService.select_by_user(request.user)
 
 admin.site.register(ExampleService, ExampleServiceAdmin)
 
@@ -75,7 +75,7 @@
         self.fields['kind'].widget.attrs['readonly'] = True
         self.fields['kind'].initial = SERVICE_NAME
 
-        self.fields['provider_service'].queryset = ExampleService.get_service_objects().all()
+        self.fields['provider_service'].queryset = ExampleService.objects.all()
 
         if self.instance:
             self.fields['creator'].initial = self.instance.creator
@@ -83,8 +83,8 @@
 
         if (not self.instance) or (not self.instance.pk):
             self.fields['creator'].initial = get_request().user
-            if ExampleService.get_service_objects().exists():
-                self.fields['provider_service'].initial = ExampleService.get_service_objects().all()[0]
+            if ExampleService.objects.exists():
+                self.fields['provider_service'].initial = ExampleService.objects.all()[0]
 
     def save(self, commit=True):
         self.instance.creator = self.cleaned_data.get('creator')
@@ -112,7 +112,7 @@
     suit_form_tabs = (('general', 'Details'),)
 
     def get_queryset(self, request):
-        return ExampleTenant.get_tenant_objects_by_user(request.user)
+        return ExampleTenant.select_by_user(request.user)
 
 admin.site.register(ExampleTenant, ExampleTenantAdmin)