From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Wed, 4 Sep 2013 13:49:21 +0000 (+0200)
Subject: Fix: merge conflict def def account_process(): in views.py
X-Git-Tag: myslice-0.2-1~22
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=02a6c1aea215c598d92bdcd37d19652800a6d156

Fix: merge conflict def def account_process(): in views.py
---

02a6c1aea215c598d92bdcd37d19652800a6d156
diff --cc portal/views.py
index 1fe771ca,04dbec5a..99807290
--- a/portal/views.py
+++ b/portal/views.py
@@@ -673,14 -188,27 +188,12 @@@ class AccountView(TemplateView)
          #context.update(page.prelude_env())
          return context
  
- #my_acc form value processing
 -
 -
 -
 -
 -
 -@login_required
 -# View for my_account form
 -#def my_account(request):
 -#    return render(request, 'my_account.html', {
 -#        #'form': form,
 -#        'topmenu_items': topmenu_items('My Account', request),
 -#        'username': the_user (request)
 -#    })
 -
 -
  @login_required
- def acc_process(request):
-     
+ #my_acc form value processing
+ def account_process(request):
 -    # getting the user_id from the session [now hardcoded]
 -    get_user = PendingUser.objects.get(id='1') # here we will get the id/email from session e.g., person.email
 -    # getting user info from manifold
 +    user_query  = Query().get('local:user').select('password','config')
 +    user_details = execute_query(request, user_query)
 +
- 
      if 'submit_name' in request.POST:
          edited_first_name =  request.POST['fname']
          edited_last_name =  request.POST['lname']