Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mgr/dashboard: restcontroller: fix detection of id args in element requests #21290

Merged
merged 1 commit into from
Apr 10, 2018
Merged

mgr/dashboard: restcontroller: fix detection of id args in element requests #21290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions src/pybind/mgr/dashboard/controllers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,17 +351,17 @@ class RESTController(BaseController):

"""

_method_mapping = {
('GET', False): ('list', 200),
('PUT', False): ('bulk_set', 200),
('PATCH', False): ('bulk_set', 200),
('POST', False): ('create', 201),
('DELETE', False): ('bulk_delete', 204),
('GET', True): ('get', 200),
('PUT', True): ('set', 200),
('PATCH', True): ('set', 200),
('DELETE', True): ('delete', 204),
}
_method_mapping = collections.OrderedDict([
(('GET', False), ('list', 200)),
(('PUT', False), ('bulk_set', 200)),
(('PATCH', False), ('bulk_set', 200)),
(('POST', False), ('create', 201)),
(('DELETE', False), ('bulk_delete', 204)),
(('GET', True), ('get', 200)),
(('PUT', True), ('set', 200)),
(('PATCH', True), ('set', 200)),
(('DELETE', True), ('delete', 204)),
])

@classmethod
def endpoints(cls):
Expand Down Expand Up @@ -453,7 +453,8 @@ def inner(*args, **kwargs):
kwargs.update(data.items())
return func(*args, **kwargs)

return func(data, *args, **kwargs)
kwargs['data'] = data
return func(*args, **kwargs)
return inner

@staticmethod
Expand Down
2 changes: 1 addition & 1 deletion src/pybind/mgr/dashboard/tests/test_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def delete(self, key):
def bulk_delete(self):
FooResource.elems = []

def set(self, data, key):
def set(self, key, data):
FooResource.elems[int(key)] = data
return dict(key=key, **data)

Expand Down