Fix: merge conflict

diff --combined portal/accountview.py
index d5f85e9,9a3f6d4..5bc30ca
--- 1/portal/accountview.py
--- 2/portal/accountview.py
+++ b/portal/accountview.py
@@@ -1,4 -1,4 +1,4 @@@
- from portal.templateviews               import LoginRequiredAutoLogoutView
+ from views.loginrequired                import LoginRequiredAutoLogoutView
  #
  from manifold.core.query                import Query
  from manifold.manifoldapi               import execute_query
@@@ -93,16 -93,6 +93,16 @@@ class AccountView(LoginRequiredAutoLogo
  def account_process(request):
      user_query  = Query().get('local:user').select('password','config')
      user_details = execute_query(request, user_query)
 +    
 +    account_query  = Query().get('local:account').select('user_id','platform_id','auth_type','config')
 +    account_details = execute_query(request, account_query)
 +
 +    platform_query  = Query().get('local:platform').select('platform_id','platform')
 +    platform_details = execute_query(request, platform_query)
 +
 +   # for account_detail in account_details:
 +    #    if account_detail['platform_id'] == 5: 
 +     #       account_config = json.loads(account_detail['config'])
  
      if 'submit_name' in request.POST:
          edited_first_name =  request.POST['fname']
@@@ -183,42 -173,6 +183,42 @@@
  #            return HttpResponse('Please upload a valid RSA public key [.txt or .pub].')    
              messages.error(request, 'RSA key error: Please upload a valid RSA public key [.txt or .pub].')
              return HttpResponseRedirect("/portal/account/")
 +
 +    elif 'dl_pubkey' in request.POST:
 +        for account_detail in account_details:
 +            for platform_detail in platform_details:
 +                if platform_detail['platform_id'] == account_detail['platform_id']:
 +                    if 'myslice' in platform_detail['platform']:
 +                        account_config = json.loads(account_detail['config'])
 +                        public_key = account_config['user_public_key'] 
 +                        response = HttpResponse(public_key, content_type='text/plain')
 +                        response['Content-Disposition'] = 'attachment; filename="pubkey.txt"'
 +                        return response
 +                        break
 +        else:
 +            messages.success(request, 'Account error: You need an account in myslice platform to perform this action')
 +            return HttpResponseRedirect("/portal/account/")
 +               
 +    elif 'dl_pkey' in request.POST:
 +        for account_detail in account_details:
 +            for platform_detail in platform_details:
 +                if platform_detail['platform_id'] == account_detail['platform_id']:
 +                    if 'myslice' in platform_detail['platform']:
 +                        account_config = json.loads(account_detail['config'])
 +                        print "hello"
 +                        if 'user_private_key' in account_config:
 +                            private_key = account_config['user_private_key']
 +                            response = HttpResponse(private_key, content_type='text/plain')
 +                            response['Content-Disposition'] = 'attachment; filename="privkey.txt"'
 +                            return response
 +                        else:
 +                            messages.success(request, 'download error: Private key is not stored in the server')
 +                            return HttpResponseRedirect("/portal/account/")
 +
 +        else:
 +            messages.success(request, 'Account error: You need an account in myslice platform to perform this action')
 +            return HttpResponseRedirect("/portal/account/")
 +           
         
      else:
          messages.info(request, 'Under Construction. Please try again later!')