]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/dashboard: fix OSD critical confirmation modal errors 35766/head
authorKiefer Chang <kiefer.chang@suse.com>
Mon, 8 Jun 2020 07:42:01 +0000 (15:42 +0800)
committerLaura Paduano <lpaduano@suse.com>
Thu, 2 Jul 2020 09:54:00 +0000 (11:54 +0200)
commit45fc63e6bb747bfb25ed6622563638671a9734c4
treed2c01375d92e2a8b20dc6dc69c1338826784ff0c
parent13e255c6d1a37f0a45e561b7e8b5e1e57384a8d5
mgr/dashboard: fix OSD critical confirmation modal errors

- Fix OSD IDs are not displayed after submitting actions.
- Fix `OSD is` and `OSDs are` strings are missing in the unsafe
  operation warning panel.

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 53401d7a54623e26cfcd538213fd0a7312bf3106)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
- Changes in the i18n section line 71 - 73
- Removed new lines of "ng template osdUsageTpl" which came with the cherry-pick
  since the template is already in a tab and thus would be duplicated
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts
- Match angular 8 line 59 ("ViewChild")
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.ts