From: Kiefer Chang <kiefer.chang@suse.com>
Date: Wed, 13 Nov 2019 06:37:00 +0000 (+0800)
Subject: mgr/dashboard: fix restored RBD image naming issue
X-Git-Tag: v14.2.8~100^2~10^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31810%2Fhead;p=ceph.git

mgr/dashboard: fix restored RBD image naming issue

The new image name in the POST data should not be URL encoded.

Fixes: https://tracker.ceph.com/issues/42785
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit b0013cd30ac31a7caf5dac0d671e5355b6e1323c)

Conflicts:
	src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.ts
        - Dashboard support of RBD namespace feature is not available in nautilus
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.ts
index 3ccf6100254e..110d7ff2db2e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.ts
@@ -133,7 +133,7 @@ export class RbdService {
     });
   }
 
-  restoreTrash(poolName, imageId, newImageName) {
+  restoreTrash(poolName, imageId, @cdEncodeNot newImageName) {
     return this.http.post(
       `api/block/image/trash/${poolName}/${imageId}/restore`,
       { new_image_name: newImageName },