IGNITE-843 Fixed dropdown-multiple for detail rows.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25d26a81 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25d26a81 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25d26a81 Branch: refs/heads/ignite-1155_1 Commit: 25d26a8195686240f6570fbc56b8de2411d19c61 Parents: f251f2c Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Jul 31 10:44:03 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Jul 31 10:44:03 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/models/caches.json | 6 +----- .../src/main/js/views/includes/controls.jade | 5 +++-- 2 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25d26a81/modules/control-center-web/src/main/js/controllers/models/caches.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json index bacfc17..df793f5 100644 --- a/modules/control-center-web/src/main/js/controllers/models/caches.json +++ b/modules/control-center-web/src/main/js/controllers/models/caches.json @@ -742,11 +742,7 @@ "items": "storeMetadata", "tip": [ "Select cache type metadata to associate database with cache." - ], - "addLink": { - "label": "Add metadata(s)", - "ref": "/configuration/metadata" - } + ] } ] }, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25d26a81/modules/control-center-web/src/main/js/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade index 8363066..faa3b96 100644 --- a/modules/control-center-web/src/main/js/views/includes/controls.jade +++ b/modules/control-center-web/src/main/js/views/includes/controls.jade @@ -130,8 +130,9 @@ mixin details-row div(ng-switch-when='dropdown-multiple') label(class=lblDetailClasses ng-class='{required: detail.required}') {{::detail.label}}: .col-sm-8 - button.form-control(bs-select data-multiple='1' data-placeholder='{{::detail.placeholder}}' bs-options='item.value as item.label for item in {{detail.items}}')&attributes(detailCommon) - +tipField('detail.tip') + +tipField('detail.tip') + .input-tip + button.form-control(bs-select data-multiple='1' data-placeholder='{{::detail.placeholder}}' bs-options='item.value as item.label for item in {{detail.items}}')&attributes(detailCommon) div(ng-switch-when='table-simple')&attributes(detailCommon) div(ng-if='detail.label') label.table-header {{::detail.label}}: