From: Lenz Grimmer Date: Tue, 23 Oct 2018 06:50:14 +0000 (+0200) Subject: Merge pull request #24544 from votdev/bug_24729 X-Git-Tag: 3.2-0~134 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5727f9b455e98f1cc93f2bde70aa86c06ee8a77b;p=ceph-ci.git Merge pull request #24544 from votdev/bug_24729 mgr/dashboard: Confirmation modal doesn't close Reviewed-by: Ricardo Marques Reviewed-by: Stephan Müller --- 5727f9b455e98f1cc93f2bde70aa86c06ee8a77b diff --cc src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.ts index aaec66fb2e2,4ed3e532bb0..656e234c5d4 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.ts @@@ -1,6 -1,6 +1,6 @@@ - import { Component, Input } from '@angular/core'; + import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service'; +import { BsModalRef } from 'ngx-bootstrap/modal'; @Component({ selector: 'cd-modal',