Login restriction added on dashboard,account,slice_req. Readme: how to update db...

[myslice.git] / portal / views.py

diff --git a/portal/views.py b/portal/views.py
index f8899eb..16086c2 100644 (file)
--- a/portal/views.py
+++ b/portal/views.py
@@ -27,6 +27,8 @@ from django.contrib              import messages
 from django.views.generic        import View
 from django.views.generic.base   import TemplateView
 from django.shortcuts            import render
 from django.views.generic        import View
 from django.views.generic.base   import TemplateView
 from django.shortcuts            import render

+from django.utils.decorators     import method_decorator
+from django.contrib.auth.decorators import login_required

 
 from plugins.lists.simplelist    import SimpleList
 from plugins.hazelnut            import Hazelnut
 
 from plugins.lists.simplelist    import SimpleList
 from plugins.hazelnut            import Hazelnut


@@ -35,7 +37,7 @@ from portal.event import Event
 import json
 
 from portal                      import signals
 import json
 
 from portal                      import signals

-from portal.forms                import UserRegisterForm, SliceRequestForm, ContactForm
+from portal.forms                import SliceRequestForm, ContactForm

 from portal.util                 import RegistrationView, ActivationView
 from portal.models               import PendingUser, PendingSlice
 from manifold.core.query         import Query
 from portal.util                 import RegistrationView, ActivationView
 from portal.models               import PendingUser, PendingSlice
 from manifold.core.query         import Query


@@ -48,6 +50,11 @@ import os, re
 
 class DashboardView(TemplateView):
     template_name = "dashboard.html"
 
 class DashboardView(TemplateView):
     template_name = "dashboard.html"

+    
+    #This view requires login 
+    @method_decorator(login_required)
+    def dispatch(self, *args, **kwargs):
+        return super(DashboardView, self).dispatch(*args, **kwargs)

 
     def get_context_data(self, **kwargs):
         # We might have slices on different registries with different user accounts 
 
     def get_context_data(self, **kwargs):
         # We might have slices on different registries with different user accounts 


@@ -470,7 +477,7 @@ class DashboardView(TemplateView):
 # DEPRECATED #        return context
 
 
 # DEPRECATED #        return context
 
 

-
+@login_required

 # View for my_account form
 def my_account(request):
     return render(request, 'my_account.html', {
 # View for my_account form
 def my_account(request):
     return render(request, 'my_account.html', {


@@ -486,7 +493,7 @@ class PlatformsView(TemplateView):
     def get_context_data(self, **kwargs):
         page = Page(self.request)
 
     def get_context_data(self, **kwargs):
         page = Page(self.request)
 

-        network_query  = Query().get('local:platform').select('platform','platform_longname','gateway_type')
+        network_query  = Query().get('local:platform').filter_by('disabled', '==', '0').select('platform','platform_longname','gateway_type')

         page.enqueue_query(network_query)
 
         page.expose_js_metadata()
         page.enqueue_query(network_query)
 
         page.expose_js_metadata()


@@ -530,7 +537,7 @@ class PlatformsView(TemplateView):
         context.update(page.prelude_env())
 
         return context
         context.update(page.prelude_env())
 
         return context

-
+@login_required

 #my_acc form value processing
 def acc_process(request):
     # getting the user_id from the session [now hardcoded]
 #my_acc form value processing
 def acc_process(request):
     # getting the user_id from the session [now hardcoded]


@@ -743,7 +750,7 @@ def contact(request):
 
     })
 
 
     })
 

-
+@login_required

 def slice_request(request):
     if request.method == 'POST': # If the form has been submitted...
         form = SliceRequestForm(request.POST) # A form bound to the POST data
 def slice_request(request):
     if request.method == 'POST': # If the form has been submitted...
         form = SliceRequestForm(request.POST) # A form bound to the POST data