From 583c62239bbf6be5222e170609e547349389c1c1 Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Wed, 1 Oct 2014 08:29:37 -0300 Subject: [PATCH] =?utf8?q?Fibre=20portal=20modifications=20by=20Jos=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- portal/homeview.py | 16 ++++++---- portal/lsapiclient.py | 2 +- portal/templates/fibre/fibre_contact.html | 2 +- .../fibre/fibre_registration_view.html | 32 +++++++++++-------- 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/portal/homeview.py b/portal/homeview.py index ec6012c8..3fc0cd85 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -125,13 +125,17 @@ class HomeView (FreeAccessView, ThemeView): print "DEBUG: user NOT exists on MySlice DBs" cn = result_set[0][0][1]['cn'][0] - print cn sn = result_set[0][0][1]['sn'][0] - print sn - fname = sn.split(' ')[0] - lname = sn.split(' ')[1] - print fname - print lname + + fname=None + lname=None + + try: + fname = sn.split(' ')[0] + lname = sn.split(' ')[1] + except: + fname = sn + lname = "" #authority_hrn = 'fibre' + '.' + username.split('@')[1] authority_hrn = 'fibre' diff --git a/portal/lsapiclient.py b/portal/lsapiclient.py index bed829d0..23584abf 100644 --- a/portal/lsapiclient.py +++ b/portal/lsapiclient.py @@ -91,7 +91,7 @@ class LaboraSchedulerClient: databaseConfig = { 'dbHost' : '10.128.11.200', 'dbUser' : 'postgres', - 'dbPassword' : '', + 'dbPassword' : '5e6b70f2e9dc', 'dbName' : 'LaboraSchedulerNOC' } diff --git a/portal/templates/fibre/fibre_contact.html b/portal/templates/fibre/fibre_contact.html index 3d4c183f..74f0eb18 100644 --- a/portal/templates/fibre/fibre_contact.html +++ b/portal/templates/fibre/fibre_contact.html @@ -17,7 +17,7 @@

Please check our FAQ section. Most of the basic problems are explained there.

If you haven't find your answes in the FAQ, please contact us by filling the form below.
- You can also e-mail us directly. + You can also e-mail us directly.

diff --git a/portal/templates/fibre/fibre_registration_view.html b/portal/templates/fibre/fibre_registration_view.html index 5dbf84c3..baa2e25e 100644 --- a/portal/templates/fibre/fibre_registration_view.html +++ b/portal/templates/fibre/fibre_registration_view.html @@ -173,45 +173,49 @@ $(document).ready(function(){ {value:"{{ authority.name }}",label:"{{authority.name}}"}, {% else %} {% if authority.authority_hrn == "fibre.ufrj" %} - {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DO RIO DE JANEIRO"}, + {value:"{{ authority.authority_hrn }}",label:"UFRJ - UNIVERSIDADE FEDERAL DO RIO DE JANEIRO"}, {% else %} {% if authority.authority_hrn == "fibre.ufg" %} - {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DE GOIAS"}, + {value:"{{ authority.authority_hrn }}",label:"UFG - UNIVERSIDADE FEDERAL DE GOIAS"}, {% else %} {% if authority.authority_hrn == "fibre.uff" %} - {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL FLUMINENSE"}, + {value:"{{ authority.authority_hrn }}",label:"UFF - UNIVERSIDADE FEDERAL FLUMINENSE"}, {% else %} {% if authority.authority_hrn == "fibre.ufpa" %} - {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DO PARA"}, + {value:"{{ authority.authority_hrn }}",label:"UFPA - UNIVERSIDADE FEDERAL DO PARA"}, {% else %} {% if authority.authority_hrn == "fibre.ufpe" %} - {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DE PERNAMBUCO"}, + {value:"{{ authority.authority_hrn }}",label:"UFPE - UNIVERSIDADE FEDERAL DE PERNAMBUCO"}, {% else %} {% if authority.authority_hrn == "fibre.ufscar" %} - {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DE SAO CARLOS"}, + {value:"{{ authority.authority_hrn }}",label:"UFSCAR - UNIVERSIDADE FEDERAL DE SAO CARLOS"}, {% else %} {% if authority.authority_hrn == "fibre.unifacs" %} - {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE SALVADOR"}, + {value:"{{ authority.authority_hrn }}",label:"UNIFACS - UNIVERSIDADE SALVADOR"}, {% else %} {% if authority.authority_hrn == "fibre.usp" %} - {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE DE SAO PAULO"}, + {value:"{{ authority.authority_hrn }}",label:"USP - UNIVERSIDADE DE SAO PAULO"}, {% else %} {% if authority.authority_hrn == "fibre.cpqd" %} - {value:"{{ authority.authority_hrn }}",label:"CENTRO DE PESQUISA E DESENVOLVIMENTO EM TELECOMUNICACOES"}, + {value:"{{ authority.authority_hrn }}",label:"CPQD - CENTRO DE PESQUISA E DESENVOLVIMENTO EM TELECOMUNICACOES"}, {% else %} {% if authority.authority_hrn == "fibre.rnp" %} - {value:"{{ authority.authority_hrn }}",label:"REDE NACIONAL DE ENSINO E PESQUISA"}, + {value:"{{ authority.authority_hrn }}",label:"(Catch-all) RNP - REDE NACIONAL DE ENSINO E PESQUISA"}, {% else %} {% if authority.authority_hrn == "fibre.i2cat" %} - {value:"{{ authority.authority_hrn }}",label:"FOUNDATION, RESEARCH AND INNOVATION IN THE INTERNET AREA"}, + {value:"{{ authority.authority_hrn }}",label:"I2CAT - FOUNDATION, RESEARCH AND INNOVATION IN THE INTERNET AREA"}, {% else %} {% if authority.authority_hrn == "fibre.uth" %} - {value:"{{ authority.authority_hrn }}",label:"UNIVERSITY OF THESSALY"}, + {value:"{{ authority.authority_hrn }}",label:"UTH - UNIVERSITY OF THESSALY"}, {% else %} {% if authority.authority_hrn == "fibre.bristol" %} - {value:"{{ authority.authority_hrn }}",label:"UNIVERSITY OF BRISTOL"}, + {value:"{{ authority.authority_hrn }}",label:"UNIBRIS - UNIVERSITY OF BRISTOL"}, {% else %} - {value:"{{ authority.authority_hrn }}",label:"FIBRE"}, + {% if authority.authority_hrn == "fibre.upmc" %} + {value:"{{ authority.authority_hrn }}",label:"UPMC - UNIVERSITE PIERRE ET MARIE CURIE"}, + {% else %} + {value:"{{ authority.authority_hrn }}",label:"FIBRE"}, + {% endif %} {% endif %} {% endif %} {% endif %} -- 2.43.0