RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 18:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26135 from Tinatinak/fix_permission_decorator

Browse Source 
mgr/dashboard: Correct permission decorator

Reviewed-by: Ricardo Dias <rdias@suse.com>
This commit is contained in:
Lenz Grimmer 2019-01-29 13:38:36 +01:00 committed by GitHub
commit 602c875bd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pybind/mgr/dashboard/controllers/rbd.py
View File

@ -12,13 +12,14 @@ import six
import rbd
from . import ApiController, RESTController, Task, UpdatePermission, DeletePermission
from . import ApiController, RESTController, Task, UpdatePermission, \
DeletePermission, CreatePermission
from .. import mgr
from ..security import Scope
from ..services.ceph_service import CephService
from ..tools import ViewCache, str_to_bool
from ..services.exception import handle_rados_error, handle_rbd_error, \
serialize_dashboard_exception
serialize_dashboard_exception
# pylint: disable=not-callable
@ -519,7 +520,7 @@ class RbdTrash(RESTController):
@RbdTask('trash/restore', ['{pool_name}', '{image_id}', '{new_image_name}'], 2.0)
@RESTController.Resource('POST')
@UpdatePermission
@CreatePermission
def restore(self, pool_name, image_id, new_image_name):
"""Restore an image from trash."""
return _rbd_call(pool_name, self.rbd_inst.trash_restore, image_id, new_image_name)