commit db236c385c165787e6bbd143455501e1af73a393
author Scott Baker <smbaker@gmail.com> Sun Jul 13 17:36:19 2014 -0700
committer Scott Baker <smbaker@gmail.com> Sun Jul 13 17:36:19 2014 -0700
tree 6d578cfb59d0679e689f4b7f6a2efe6177e16d99
parent f45031f08b2eacff632b108fce68672d030350d7

xosDeveloper view working

planetstack/core/xoslib/methods/__init__.py

diff --git a/planetstack/core/xoslib/methods/__init__.py b/planetstack/core/xoslib/methods/__init__.py
index 6c75063..0b891eb 100644
--- a/planetstack/core/xoslib/methods/__init__.py
+++ b/planetstack/core/xoslib/methods/__init__.py
@@ -37,9 +37,9 @@
 
     for view_url in view_urls:
         if view_url[0] == "list":
-           urlpatterns.append(url(r'^xoslib/' + view_url[1] + '/$',  view_url[3].as_view(), name=view_url[1]+'list'))
+           urlpatterns.append(url(r'^' + view_url[1] + '/$',  view_url[3].as_view(), name=view_url[1]+'list'))
         elif view_url[0] == "detail":
-           urlpatterns.append(url(r'^xoslib/' + view_url[1] + '/(?P<pk>[a-zA-Z0-9\-]+)/$',  view_url[3].as_view(), name=view_url[1]+'list'))
+           urlpatterns.append(url(r'^' + view_url[1] + '/(?P<pk>[a-zA-Z0-9\-]+)/$',  view_url[3].as_view(), name=view_url[1]+'detail'))
 
 finally:
     sys.path = sys_path_save

planetstack/core/xoslib/methods/sliceplus.py

diff --git a/planetstack/core/xoslib/methods/sliceplus.py b/planetstack/core/xoslib/methods/sliceplus.py
index 79aae3b..f990275 100644
--- a/planetstack/core/xoslib/methods/sliceplus.py
+++ b/planetstack/core/xoslib/methods/sliceplus.py
@@ -13,7 +13,7 @@
         sliceInfo = serializers.SerializerMethodField("getSliceInfo")

 

         def getSliceInfo(self, slice):

-            return slice.getSliceInfo()

+            return slice.getSliceInfo(user=self.context['request'].user)

 

         networks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')

         availableNetworks = serializers.HyperlinkedRelatedField(many=True, read_only=True, view_name='network-detail')

@@ -26,6 +26,9 @@
     queryset = SlicePlus.objects.select_related().all()
     serializer_class = SlicePlusIdSerializer
 
+    method_kind = "list"
+    method_name = "slicesplus"
+
     def get_queryset(self):
         return SlicePlus.select_by_user(self.request.user)
 
@@ -41,6 +44,9 @@
     queryset = SlicePlus.objects.select_related().all()
     serializer_class = SlicePlusIdSerializer
 
+    method_kind = "detail"
+    method_name = "slicesplus"
+
     def get_queryset(self):
         return SlicePlus.select_by_user(self.request.user)