git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bcfa189
)
Fibre portal modifications by José
author
Loic Baron
<loic.baron@lip6.fr>
Wed, 1 Oct 2014 11:29:37 +0000
(08:29 -0300)
committer
Loic Baron
<loic.baron@lip6.fr>
Wed, 1 Oct 2014 11:29:37 +0000
(08:29 -0300)
portal/homeview.py
patch
|
blob
|
history
portal/lsapiclient.py
patch
|
blob
|
history
portal/templates/fibre/fibre_contact.html
patch
|
blob
|
history
portal/templates/fibre/fibre_registration_view.html
patch
|
blob
|
history
diff --git
a/portal/homeview.py
b/portal/homeview.py
index
ec6012c
..
3fc0cd8
100644
(file)
--- 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 "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]
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'
#authority_hrn = 'fibre' + '.' + username.split('@')[1]
authority_hrn = 'fibre'
diff --git
a/portal/lsapiclient.py
b/portal/lsapiclient.py
index
bed829d
..
23584ab
100644
(file)
--- a/
portal/lsapiclient.py
+++ b/
portal/lsapiclient.py
@@
-91,7
+91,7
@@
class LaboraSchedulerClient:
databaseConfig = {
'dbHost' : '10.128.11.200',
'dbUser' : 'postgres',
databaseConfig = {
'dbHost' : '10.128.11.200',
'dbUser' : 'postgres',
- 'dbPassword' : '',
+ 'dbPassword' : '
5e6b70f2e9dc
',
'dbName' : 'LaboraSchedulerNOC'
}
'dbName' : 'LaboraSchedulerNOC'
}
diff --git
a/portal/templates/fibre/fibre_contact.html
b/portal/templates/fibre/fibre_contact.html
index
3d4c183
..
74f0eb1
100644
(file)
--- a/
portal/templates/fibre/fibre_contact.html
+++ b/
portal/templates/fibre/fibre_contact.html
@@
-17,7
+17,7
@@
<p>Please check our <a href="/portal/support/">FAQ</a> section. Most of the basic problems are explained there.</p>
<p>
If you haven't find your answes in the FAQ, please contact us by filling the form below.<br />
<p>Please check our <a href="/portal/support/">FAQ</a> section. Most of the basic problems are explained there.</p>
<p>
If you haven't find your answes in the FAQ, please contact us by filling the form below.<br />
- You can also <a href="mailto:
support@myslice.info
">e-mail</a> us directly.
+ You can also <a href="mailto:
info@fibre.org.br
">e-mail</a> us directly.
</p>
</div>
</div>
</p>
</div>
</div>
diff --git
a/portal/templates/fibre/fibre_registration_view.html
b/portal/templates/fibre/fibre_registration_view.html
index
5dbf84c
..
baa2e25
100644
(file)
--- 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.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:"U
FRJ - U
NIVERSIDADE FEDERAL DO RIO DE JANEIRO"},
{% else %}
{% if authority.authority_hrn == "fibre.ufg" %}
{% else %}
{% if authority.authority_hrn == "fibre.ufg" %}
- {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DE GOIAS"},
+ {value:"{{ authority.authority_hrn }}",label:"U
FG - U
NIVERSIDADE FEDERAL DE GOIAS"},
{% else %}
{% if authority.authority_hrn == "fibre.uff" %}
{% else %}
{% if authority.authority_hrn == "fibre.uff" %}
- {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL FLUMINENSE"},
+ {value:"{{ authority.authority_hrn }}",label:"U
FF - U
NIVERSIDADE FEDERAL FLUMINENSE"},
{% else %}
{% if authority.authority_hrn == "fibre.ufpa" %}
{% else %}
{% if authority.authority_hrn == "fibre.ufpa" %}
- {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DO PARA"},
+ {value:"{{ authority.authority_hrn }}",label:"U
FPA - U
NIVERSIDADE FEDERAL DO PARA"},
{% else %}
{% if authority.authority_hrn == "fibre.ufpe" %}
{% else %}
{% if authority.authority_hrn == "fibre.ufpe" %}
- {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DE PERNAMBUCO"},
+ {value:"{{ authority.authority_hrn }}",label:"U
FPE - U
NIVERSIDADE FEDERAL DE PERNAMBUCO"},
{% else %}
{% if authority.authority_hrn == "fibre.ufscar" %}
{% else %}
{% if authority.authority_hrn == "fibre.ufscar" %}
- {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DE SAO CARLOS"},
+ {value:"{{ authority.authority_hrn }}",label:"U
FSCAR - U
NIVERSIDADE FEDERAL DE SAO CARLOS"},
{% else %}
{% if authority.authority_hrn == "fibre.unifacs" %}
{% else %}
{% if authority.authority_hrn == "fibre.unifacs" %}
- {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE SALVADOR"},
+ {value:"{{ authority.authority_hrn }}",label:"UNI
FACS - UNI
VERSIDADE SALVADOR"},
{% else %}
{% if authority.authority_hrn == "fibre.usp" %}
{% else %}
{% if authority.authority_hrn == "fibre.usp" %}
- {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE DE SAO PAULO"},
+ {value:"{{ authority.authority_hrn }}",label:"U
SP - U
NIVERSIDADE DE SAO PAULO"},
{% else %}
{% if authority.authority_hrn == "fibre.cpqd" %}
{% else %}
{% if authority.authority_hrn == "fibre.cpqd" %}
- {value:"{{ authority.authority_hrn }}",label:"CENTRO DE PESQUISA E DESENVOLVIMENTO EM TELECOMUNICACOES"},
+ {value:"{{ authority.authority_hrn }}",label:"C
PQD - C
ENTRO DE PESQUISA E DESENVOLVIMENTO EM TELECOMUNICACOES"},
{% else %}
{% if authority.authority_hrn == "fibre.rnp" %}
{% 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" %}
{% 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" %}
{% else %}
{% if authority.authority_hrn == "fibre.uth" %}
- {value:"{{ authority.authority_hrn }}",label:"UNIVERSITY OF THESSALY"},
+ {value:"{{ authority.authority_hrn }}",label:"U
TH - U
NIVERSITY OF THESSALY"},
{% else %}
{% if authority.authority_hrn == "fibre.bristol" %}
{% else %}
{% if authority.authority_hrn == "fibre.bristol" %}
- {value:"{{ authority.authority_hrn }}",label:"UNIVERSITY OF BRISTOL"},
+ {value:"{{ authority.authority_hrn }}",label:"UNI
BRIS - UNI
VERSITY OF BRISTOL"},
{% else %}
{% 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 %}
{% endif %}
{% endif %}
{% endif %}