From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Mon, 29 Jul 2013 15:15:19 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~86
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d9fa97447cdfd1fc896d840f7b3bebbb3d2bd921;hp=-c;p=myslice.git

Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
---

d9fa97447cdfd1fc896d840f7b3bebbb3d2bd921
diff --combined portal/views.py
index afed7e85,9f31b7d4..27455f2e
--- a/portal/views.py
+++ b/portal/views.py
@@@ -48,7 -48,7 +48,7 @@@ class DashboardView(TemplateView)
  
          # Slow...
          #slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn')
-         slice_query = Query().get('user').filter_by('user_hrn', '==', user_hrn).select('slice.slice_hrn')
+         slice_query = Query().get('user').filter_by('user_hrn', '==', user_hrn).select('user_hrn', 'slice.slice_hrn')
          auth_query  = Query().get('network').select('network_hrn')
          page.enqueue_query(slice_query)
          page.enqueue_query(auth_query)
@@@ -78,7 -78,7 +78,7 @@@
          # more general variables expected in the template
          context['title'] = 'Test view that combines various plugins'
          # the menu items on the top
-         context['topmenu_items'] = topmenu_items('dashboard', self.request) 
+         context['topmenu_items'] = topmenu_items('Dashboard', self.request) 
          # so we can sho who is logged
          context['username'] = the_user(self.request) 
  
@@@ -172,6 -172,12 +172,12 @@@ class UserRegisterView(RegistrationView
                                       request=request)
          return new_user
  
+     def get_context_data(self, **kwargs):
+         context = super(UserRegisterView, self).get_context_data(**kwargs)
+         context['topmenu_items'] = topmenu_items('Register', self.request)
+         context['username'] = the_user (self.request)
+         return context
+ 
      def registration_allowed(self, request):
          """
          Indicate whether account registration is currently permitted,
@@@ -423,60 -429,6 +429,60 @@@ class UserValidateView(ActivationView)
  # DEPRECATED #
  # DEPRECATED #    return p.render()
  
 +class MyAccountView(TemplateView):
 +    template_name = "my_account.html"
 +
 +    def get_context_data(self, **kwargs):
 +        #user_hrn = 'ple.upmc.jordan_auge'
 +
 +        #messages.info(self.request, 'You have logged in')
 +        page = Page(self.request)
 +
 +        # Slow...
 +        #slice_query = Query().get('slice').filter_by('user.user_hrn', 'contains', user_hrn).select('slice_hrn')
 +        #slice_query = Query().get('user').filter_by('user_hrn', '==', user_hrn).select('slice.slice_hrn')
 +        #auth_query  = Query().get('network').select('network_hrn')
 +        #page.enqueue_query(slice_query)
 +        #page.enqueue_query(auth_query)
 +
 +        #page.expose_queries()
 +
 +        #slicelist = SimpleList(
 +        #    title = None,
 +        #    page  = page,
 +        #    key   = 'slice.slice_hrn',
 +        #    query = slice_query,
 +        #)
 +
 +        #authlist = SimpleList(
 +        #    title = None,
 +        #    page  = page,
 +        #    key   = 'network_hrn',
 +        #    query = auth_query,
 +        #)
 +
 +        context = super(MyAccountView, self).get_context_data(**kwargs)
 +        context['person']   = self.request.user
 +        #context['networks'] = authlist.render(self.request)
 +        #context['slices']   = slicelist.render(self.request)
 +
 +        # XXX This is repeated in all pages
 +        # more general variables expected in the template
 +        context['title'] = 'User Profile Page'
 +        # the menu items on the top
 +        context['topmenu_items'] = topmenu_items('my_account', self.request)
 +        # so we can sho who is logged
 +        context['username'] = the_user(self.request)
 +
 +        context.update(page.prelude_env())
 +
 +        return context
 +
 +
 +
 +
 +
 +
  
  # view for contact form
  def contact(request):
@@@ -529,7 -481,20 +535,20 @@@ def slice_request(request)
      else:
          form = SliceRequestForm() # An unbound form
  
+ #    template_env = {}
+ #    template_env['form'] = form
+ #    template_env['topmenu_items'] = topmenu_items('Request a slice', request) 
+ #    template_env['unfold1_main'] = render(request, 'slice_request_.html', {
+ #        'form': form,
+ #    })
+ #    from django.shortcuts                import render_to_response
+ #    from django.template                 import RequestContext
+ #    return render_to_response ('view-unfold1.html',template_env,
+ #                               context_instance=RequestContext(request))
+ 
      return render(request, 'slice_request.html', {
          'form': form,
+         'topmenu_items': topmenu_items('Request a slice', request),
+         'username': the_user (request) 
      })