From: Lenz Grimmer <lenz@grimmer.com>
Date: Thu, 26 Apr 2018 09:44:20 +0000 (+0200)
Subject: Merge pull request #21529 from ricardoasmarques/wip-fix-rbd-form
X-Git-Tag: v13.1.0~90
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed46117e3f6135568982f7aa30e6cf71a44a476b;p=ceph-ci.git

Merge pull request #21529 from ricardoasmarques/wip-fix-rbd-form

mgr/dashboard: Display RBD form errors on submission

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
---

ed46117e3f6135568982f7aa30e6cf71a44a476b
diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
index 878b0631aef,f069f35d162..538468306fd
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.html
@@@ -301,10 -296,10 +301,10 @@@
        </div>
        <div class="panel-footer">
          <div class="button-group text-right">
-           <cd-submit-button [form]="rbdForm"
+           <cd-submit-button [form]="formDir"
                              type="button"
                              (submitAction)="submit()">
 -            <span i18n>{editing, select, 1 {Update} other {Create}}</span> RBD
 +            <span i18n>{mode, select, editing {Update} cloning {Clone} copying {Copy} other {Create}}</span> RBD
            </cd-submit-button>
            <button i18n
                    type="button"