Set the name for sharing resources, for consistency

truenas · Sep 11, 2013 · 66f3048 · 66f3048
1 parent 1f0687e
commit 66f3048
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/gui/api/resources.py b/gui/api/resources.py
@@ -860,6 +860,9 @@ def dehydrate(self, bundle):
 
 class NFSShareResourceMixin(object):
 
+    class Meta:
+        resource_name = 'sharing/nfs'
+
     def dehydrate(self, bundle):
         bundle = super(NFSShareResourceMixin, self).dehydrate(bundle)
         if self.is_webclient(bundle.request):

diff --git a/gui/api/tests/sharing.py b/gui/api/tests/sharing.py
@@ -19,7 +19,7 @@ def setUp(self):
         )
 
 
-class CIFS_ShareResourceTest(CommonMixin, APITestCase):
+class CIFSResourceTest(CommonMixin, APITestCase):
 
     def test_get_list_unauthorzied(self):
         self.assertHttpUnauthorized(
@@ -125,7 +125,7 @@ def test_Delete(self):
         self.assertHttpAccepted(resp)
 
 
-class AFP_ShareResourceTest(CommonMixin, APITestCase):
+class AFPResourceTest(CommonMixin, APITestCase):
 
     def test_get_list_unauthorzied(self):
         self.assertHttpUnauthorized(
@@ -240,7 +240,7 @@ def test_Delete(self):
         self.assertHttpAccepted(resp)
 
 
-class NFS_ShareResourceTest(CommonMixin, APITestCase):
+class NFSResourceTest(CommonMixin, APITestCase):
 
     def test_get_list_unauthorzied(self):
         self.assertHttpUnauthorized(

diff --git a/gui/sharing/admin.py b/gui/sharing/admin.py
@@ -26,6 +26,7 @@ class AFPShareFAdmin(BaseFreeAdmin):
         'afp_comment',
         'afp_path',
     )
+    resource_name = 'sharing/afp'
 
 
 class CIFSShareFAdmin(BaseFreeAdmin):
@@ -47,6 +48,7 @@ class CIFSShareFAdmin(BaseFreeAdmin):
         'cifs_browsable',
         'cifs_guestok',
     )
+    resource_name = 'sharing/cifs'
 
 
 class NFSShareFAdmin(BaseFreeAdmin):