git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
[unfold.git]
/
portal
/
slicetabexperiment.py
diff --git
a/portal/slicetabexperiment.py
b/portal/slicetabexperiment.py
index
9260f27
..
ab2fee2
100644
(file)
--- a/
portal/slicetabexperiment.py
+++ b/
portal/slicetabexperiment.py
@@
-78,7
+78,9
@@
class ExperimentView (FreeAccessView, ThemeView):
#print "list of nitos res hrns"
#print nitos_resource_list
#print "list of nitos res hrns"
#print nitos_resource_list
+ all_users = list()
#get all iotlab users
#get all iotlab users
+ all_users = list()
try:
engine = ConfigEngine()
userData = "Basic " + (engine.iotlab_admin_user() + ":" + engine.iotlab_admin_password()).encode("base64").rstrip()
try:
engine = ConfigEngine()
userData = "Basic " + (engine.iotlab_admin_user() + ":" + engine.iotlab_admin_password()).encode("base64").rstrip()
@@
-92,7
+94,6
@@
class ExperimentView (FreeAccessView, ThemeView):
except urllib2.URLError as e:
print "There is a problem in getting iotlab users %s" % e.reason
except urllib2.URLError as e:
print "There is a problem in getting iotlab users %s" % e.reason
- all_users = list()
#getting the login from email
#initial value no-account == contact_admin
#getting the login from email
#initial value no-account == contact_admin