[X2Go-Commits] [x2gobroker] 02/02: the JSON webUI also accepts profile-id (instead of sid) for task selectsession

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gobroker.

commit af5bd9d87fb69fb90399a97f07b4d5b725f2a5cc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 10 15:27:57 2014 +0100

    the JSON webUI also accepts profile-id (instead of sid) for task selectsession
---
 x2gobroker/web/json.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/x2gobroker/web/json.py b/x2gobroker/web/json.py
index 807672e..5d2d295 100644
--- a/x2gobroker/web/json.py
+++ b/x2gobroker/web/json.py
@@ -113,10 +113,12 @@ class X2GoBrokerWeb(_RequestHandler):
         password = self.get_argument('password', default='')
         cookie = self.get_argument('authid', default='')
         task = self.get_argument('task', default='')
-        profile_id = self.get_argument('sid', default='')
+        profile_id = self.get_argument('profile-id', default='')
         new_password = self.get_argument('newpass', default='')
 
+        # compat stuff
         if task == 'listsessions': task = 'listprofiles'
+        profile_id = self.get_argument('sid', default=profile_id)
 
         payload = {
             'task': task,

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