[X2Go-Commits] [python-x2go] 01/05: brokerclient: adapt to recent changes in the JSON webUI of the broker

git-admin at x2go.org git-admin at x2go.org
Mon Mar 10 16:08:46 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch brokerclient
in repository python-x2go.

commit a4735298c176afa74cdd05cac4c07bc87b38eff5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Mar 9 12:46:03 2014 +0100

    brokerclient: adapt to recent changes in the JSON webUI of the broker
---
 x2go/backends/profiles/httpbroker.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/x2go/backends/profiles/httpbroker.py b/x2go/backends/profiles/httpbroker.py
index 1739597..c24f46d 100644
--- a/x2go/backends/profiles/httpbroker.py
+++ b/x2go/backends/profiles/httpbroker.py
@@ -99,13 +99,14 @@ class X2GoSessionProfiles(base.X2GoSessionProfiles):
 
     def broker_listsessions(self):
         payload = {
-            'task': 'listsessions',
+            'task': 'listprofiles',
             'user': self.broker_user,
             'password': self.broker_password,
         }
         r = requests.post(self.broker_url, data=payload)
         if r.status_code == 200 and r.headers['content-type'].startswith("text/json"):
-            return json.loads(r.text)
+            payload = json.loads(r.text)
+            return payload['profiles'] if payload['task'] == 'listprofiles' else {}
 
     def _populate_session_profiles(self):
         """\

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git



More information about the x2go-commits mailing list