projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug 1035. Load role permissions from nbi.py 'valid_url_methods' instead of 'resources...
[osm/NBI.git]
/
osm_nbi
/
admin_topics.py
diff --git
a/osm_nbi/admin_topics.py
b/osm_nbi/admin_topics.py
index
a564eae
..
9f591fc
100644
(file)
--- a/
osm_nbi/admin_topics.py
+++ b/
osm_nbi/admin_topics.py
@@
-660,7
+660,7
@@
class UserTopicAuth(UserTopic):
:return: dictionary, raise exception if not found.
"""
# Allow _id to be a name or uuid
:return: dictionary, raise exception if not found.
"""
# Allow _id to be a name or uuid
- filter_q = {
self.id_field(self.topic, _id)
: _id}
+ filter_q = {
"username"
: _id}
# users = self.auth.get_user_list(filter_q)
users = self.list(session, filter_q) # To allow default filtering (Bug 853)
if len(users) == 1:
# users = self.auth.get_user_list(filter_q)
users = self.list(session, filter_q) # To allow default filtering (Bug 853)
if len(users) == 1:
@@
-1027,10
+1027,10
@@
class RoleTopicAuth(BaseTopic):
schema_edit = roles_edit_schema
multiproject = False
schema_edit = roles_edit_schema
multiproject = False
- def __init__(self, db, fs, msg, auth
, ops
):
+ def __init__(self, db, fs, msg, auth):
BaseTopic.__init__(self, db, fs, msg, auth)
# self.auth = auth
BaseTopic.__init__(self, db, fs, msg, auth)
# self.auth = auth
- self.operations =
op
s
+ self.operations =
auth.role_permission
s
# self.topic = "roles_operations" if isinstance(auth, AuthconnKeystone) else "roles"
@staticmethod
# self.topic = "roles_operations" if isinstance(auth, AuthconnKeystone) else "roles"
@staticmethod