[X2Go-Commits] x2gobroker.git - master-inai (branch) updated: 051ecfd603383cc3f38b225d36414a4d55928616
X2Go dev team
git-admin at x2go.org
Tue Apr 23 21:08:21 CEST 2013
The branch, master-inai has been updated
via 051ecfd603383cc3f38b225d36414a4d55928616 (commit)
from 7cec31fca2245fd8d9dfb2bc5f85d6c31019e067 (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/backends/base.py | 10 +++++++++-
x2gobroker/backends/inifile.py | 12 ------------
2 files changed, 9 insertions(+), 13 deletions(-)
The diff of changes is:
diff --git a/x2gobroker/backends/base.py b/x2gobroker/backends/base.py
index 50be3f1..9c2e5b7 100644
--- a/x2gobroker/backends/base.py
+++ b/x2gobroker/backends/base.py
@@ -393,7 +393,15 @@ class X2GoBroker(object):
rtype: C{dict}
"""
- return {}
+ list_of_profiles = {}
+ for profile_id in self.get_profile_ids():
+ profile = self.get_profile(profile_id)
+ acls = self.get_profile_acls(profile_id)
+
+ if self.check_acls(username, acls):
+ list_of_profiles.update(profile)
+
+ return list_of_profiles
def select_profile(self, profile_name='DEFAULT'):
"""\
diff --git a/x2gobroker/backends/inifile.py b/x2gobroker/backends/inifile.py
index 1c166c8..f5080f1 100644
--- a/x2gobroker/backends/inifile.py
+++ b/x2gobroker/backends/inifile.py
@@ -82,18 +82,6 @@ class X2GoBroker(base.X2GoBroker):
del profile[key]
return profile
- def list_profiles(self, username):
-
- list_of_profiles = {}
- for profile_id in self.get_profile_ids():
- profile = self.get_profile(profile_id)
- acls = self.get_profile_acls(profile_id)
-
- if self.check_acls(username, acls):
- list_of_profiles.update(profile)
-
- return list_of_profiles
-
def select_profile(self, profile_name):
selectprofile_output = {
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).
More information about the x2go-commits
mailing list