From c80974a5b49b411650055ac56c562d7fc571efdb Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Thu, 31 Oct 2019 21:39:17 +0000 Subject: [PATCH] mgr/dashboard: Fix error on ceph-iscsi version pre controls_limits Signed-off-by: Ricardo Marques (cherry picked from commit 1dd37b00de0127fd5c3ef84d943a806c3ba722f1) --- .../iscsi-target-image-settings-modal.component.ts | 6 +++++- .../iscsi-target-iqn-settings-modal.component.ts | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) 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' }; } } -- 2.39.5