From: Ricardo Marques <rimarques@suse.com>
Date: Thu, 31 Oct 2019 21:39:17 +0000 (+0000)
Subject: mgr/dashboard: Fix error on ceph-iscsi version pre controls_limits
X-Git-Tag: v14.2.5~131^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c80974a5b49b411650055ac56c562d7fc571efdb;p=ceph.git

mgr/dashboard: Fix error on ceph-iscsi version pre controls_limits

Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit 1dd37b00de0127fd5c3ef84d943a806c3ba722f1)
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.ts
index ee021be85ed64..b8b527623fc1e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-image-settings-modal/iscsi-target-image-settings-modal.component.ts
@@ -42,7 +42,11 @@ export class IscsiTargetImageSettingsModalComponent implements OnInit {
   }
 
   getDiskControlLimits(backstore, setting) {
-    return this.disk_controls_limits[backstore][setting];
+    if (this.disk_controls_limits) {
+      return this.disk_controls_limits[backstore][setting];
+    }
+    // backward compatibility
+    return { type: 'int' };
   }
 
   save() {
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.ts
index 25ed109ac77aa..26e3cb0f3c9b9 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi-target-iqn-settings-modal/iscsi-target-iqn-settings-modal.component.ts
@@ -43,6 +43,13 @@ export class IscsiTargetIqnSettingsModalComponent implements OnInit {
   }
 
   getTargetControlLimits(setting) {
-    return this.target_controls_limits[setting];
+    if (this.target_controls_limits) {
+      return this.target_controls_limits[setting];
+    }
+    // backward compatibility
+    if (['Yes', 'No'].includes(this.target_default_controls[setting])) {
+      return { type: 'bool' };
+    }
+    return { type: 'int' };
   }
 }