From: Loic Baron Date: Wed, 2 Jul 2014 17:34:51 +0000 (-0300) Subject: Adicionando as ultimas modificacoes feitas pelo Edelberto X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2137aea5dfd102f1b211ec3138d8d5f639f3c28b;p=myslice.git Adicionando as ultimas modificacoes feitas pelo Edelberto --- diff --git a/portal/actions.py b/portal/actions.py index 17265c6e..888d2062 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -657,6 +657,7 @@ def create_user(wsgi_request, request): # Add the user to the SFA registry sfa_create_user(wsgi_request, request) + ''' # LDAP update user userEnabled = True try: mail = request['email'] @@ -669,7 +670,7 @@ def create_user(wsgi_request, request): ldap_modify_user(wsgi_request, request) except Exception, e: "LDAP create user failed" - + ''' def create_pending_user(wsgi_request, request, user_detail): """ """ diff --git a/portal/registrationview.py b/portal/registrationview.py index 4f8ab90a..12a720dc 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -133,6 +133,7 @@ class RegistrationView (FreeAccessView, ThemeView): user_request['public_key'] = file_content if not errors: + ''' try: # verify if is a LDAP mail = user_detail['email'] @@ -144,8 +145,10 @@ class RegistrationView (FreeAccessView, ThemeView): if dc == 'br' or 'eu': # LDAP insert directly - but with userEnable = FALSE ldap_create_user(wsgi_request, user_request, user_detail) + except Exception, e: print "LDAP: problem em access the LDAP with this credentail" + ''' create_pending_user(wsgi_request, user_request, user_detail) self.template_name = 'user_register_complete.html' diff --git a/portal/templates/base.html b/portal/templates/base.html index decd041e..839c9550 100644 --- a/portal/templates/base.html +++ b/portal/templates/base.html @@ -72,7 +72,7 @@ $(document).ready(function() { {% block container %} {% block topmenu %} - {% widget "_widget-topmenu.html" %} + {% widget "__widget-topmenu.html" %} {% endblock topmenu %} {% include 'messages-transient.html' %} {% block base_content %} diff --git a/portal/templates/fibre/.fibre__widget-login-fed-manager.html.swp b/portal/templates/fibre/.fibre__widget-login-fed-manager.html.swp deleted file mode 100644 index bdd90af1..00000000 Binary files a/portal/templates/fibre/.fibre__widget-login-fed-manager.html.swp and /dev/null differ diff --git a/portal/templates/fibre/fibre__widget-login-fed-manager.html b/portal/templates/fibre/fibre__widget-login-fed-manager.html index 5754b355..8114d9ec 100644 --- a/portal/templates/fibre/fibre__widget-login-fed-manager.html +++ b/portal/templates/fibre/fibre__widget-login-fed-manager.html @@ -9,11 +9,11 @@ {% endif %}

Username diff --git a/portal/templates/fibre/fibre__widget-topmenu.html b/portal/templates/fibre/fibre__widget-topmenu.html index b9163949..b05d887d 100644 --- a/portal/templates/fibre/fibre__widget-topmenu.html +++ b/portal/templates/fibre/fibre__widget-topmenu.html @@ -1,19 +1,16 @@ -{% insert_str prelude "js/bootstrap.js" %} -{% insert_str prelude "css/bootstrap.css" %} -{% insert_str prelude "css/topmenu.css" %} -{% insert_str prelude "js/logout.js" %} +