From: Bruno Soares da Silva <brunosoares.inf@gmail.com>
Date: Tue, 16 Sep 2014 21:47:39 +0000 (-0300)
Subject: Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=43a4dfd5c95080af83cc2ccf2c7d75218e985e57

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

Conflicts:
	portal/actions.py
	portal/lsapiclient.py
---

43a4dfd5c95080af83cc2ccf2c7d75218e985e57
diff --cc portal/actions.py
index 0a1989a1,feef871d..07943ef3
--- a/portal/actions.py
+++ b/portal/actions.py
@@@ -613,20 -610,12 +614,20 @@@ def ls_validate_user(wsgi_request, requ
              'new_user_data' : { 'enable': 'TRUE' }
          }
          
 -        validate = lsClient.update_user( user_data )
 -
 -        addUserPublicKey = lsClient.add_user_public_key( { 'user_id' : user_id, 'public_key': request['public_key'] } )
 +        validate = lsClient.update_user( userData )
          
-     return validate
+     return validate and addUserPublicKey
  
 +def ls_update_public_key( wsgi_request, request, lsClient, userId ):
 +    userPbKey = {
 +        'user_id'       : userId,
 +        'public_key'    : request['public_key']
 +    }
 +    
 +    addUserPublicKey = lsClient.add_user_public_key( userPbKey )
 +    
 +    return addUserPublicKey
 +
  def create_user(wsgi_request, request):
      
      # XXX This has to be stored centrally
diff --cc portal/lsapiclient.py
index 0e6edde4,ead040e0..bed829d0
--- a/portal/lsapiclient.py
+++ b/portal/lsapiclient.py
@@@ -91,8 -90,8 +90,8 @@@ class LaboraSchedulerClient
          
          databaseConfig = {
              'dbHost'        : '10.128.11.200',
 -            'dbUser'        : '',
 +            'dbUser'        : 'postgres',
-             'dbPassword'    : '5e6b70f2e9dc',
+             'dbPassword'    : '',
              'dbName'        : 'LaboraSchedulerNOC'
          }