[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.1.0-11-gd14d83a

[X2Go dev team]

The branch, build-main has been updated
       via  d14d83a114d66019fe9fa031f3a367c65224cf6a (commit)
      from  8130c9d12e3447fda3064b4b3f1ba0aef1015341 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2gobroker/uccsjson.py |    2 +-
 x2gobroker/web/uccs.py |   36 +++++++++++++++++-------------------
 2 files changed, 18 insertions(+), 20 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/uccsjson.py b/x2gobroker/uccsjson.py
index 779e2ba..abbcd80 100644
--- a/x2gobroker/uccsjson.py
+++ b/x2gobroker/uccsjson.py
@@ -62,7 +62,7 @@ class ManagementServer():
         else:
             raise TypeError("set_default expects a string argument")
 
-    def add_terminal_server(self, server):
+    def add_terminalserver(self, server):
         """\
         Add a terminal server to this management server object.
 
diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py
index 6078383..394583c 100644
--- a/x2gobroker/web/uccs.py
+++ b/x2gobroker/web/uccs.py
@@ -102,29 +102,27 @@ class X2GoBrokerWeb(tornado.web.RequestHandler):
         ###
 
         profiles = broker_backend.list_profiles(username)
-        if profiles:
-            ms = x2gobroker.uccsjson.ManagementServer('http://localhost:8080/uccs/{backend}'.format(backend=backend), 'X2Go Session Broker')
+        ms = x2gobroker.uccsjson.ManagementServer('http://localhost:8080/uccs/{backend}'.format(backend=backend), 'X2Go Session Broker')
 
-            profile_ids = profiles.keys()
-            profile_ids.sort()
+        profile_ids = profiles.keys()
+        profile_ids.sort()
 
-            for profile_id in profile_ids:
+        for profile_id in profile_ids:
 
-                print profiles[profile_id]
-                if profiles[profile_id][u'directrdp']:
-                    pass
-                else:
-                    ts = x2gobroker.uccsjson.X2GoServer(
-                            host='{hostname}:{port}'.format(hostname=profiles[profile_id][u'host'], port=profiles[profile_id][u'sshport']),
-                            name=profiles[profile_id][u'name'],
-                            username=profiles[profile_id][u'user'],
-                    )
-                ms.add_terminal(ts)
+            if profiles[profile_id][u'directrdp']:
+                pass
+            else:
+                ts = x2gobroker.uccsjson.X2GoServer(
+                        host='{hostname}:{port}'.format(hostname=profiles[profile_id][u'host'], port=profiles[profile_id][u'sshport']),
+                        name=profiles[profile_id][u'name'],
+                        username=profiles[profile_id][u'user'],
+                )
+            ms.add_terminalserver(ts)
 
-            output += ms.toJson()
+        output += ms.toJson()
 
-            self.write(output)
-            return
+        self.write(output)
+        return
 
-        raise tornado.web.HTTPError(401)
+        #raise tornado.web.HTTPError(401)
 


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).