ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [2/4] ignite git commit: IGNITE-2347 WIP reworking metadata load.
Date Mon, 11 Jan 2016 17:44:20 GMT
http://git-wip-us.apache.org/repos/asf/ignite/blob/65f74f5f/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
index dd1a320..3c21d7c 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
@@ -26,22 +26,17 @@ mixin chk(mdl, change, tip)
                 button.close(ng-click='$hide()' aria-hidden='true') ×
                 h4.modal-title Load metadata from database
             .metadata-content(ng-show='loadMeta.action == "drivers"')
-            .metadata-content(ng-show='loadMeta.action == "connect"')
+            .metadata-content(ng-show='loadMeta.action == "connect" && loadMeta.demo')
+                label Demo description:
+                ul
+                    li In-memory H2 database server will be started inside agent
+                    li Database will be populated with sample tables
+                    li You could test loading metadata using this demo database
+                    li Click "Next" to continue
+            .metadata-content(ng-show='loadMeta.action == "connect" && !loadMeta.demo')
                 form.form-horizontal(name='connectForm' novalidate)
                     .settings-row(ng-repeat='field in metadataDb')
-                        +form-row-custom(['col-xs-4 col-sm-3 col-md-3'], ['col-xs-8 col-sm-9
col-md-9'], 'preset')
-                div(ng-show='preset.drvIdx < 1' style='margin-top: 6px')
-                    label Demo description:
-                    ul
-                        li In-memory H2 database server will be started inside agent
-                        li Database will be populated with sample tables
-                        li You could test loading metadata using this sample database
-                div(ng-show='preset.drvIdx > 0')
-                    label To load metadata:
-                    ul
-                        li Configure connection to database
-                        li Select schemas
-                        li Select tables
+                        +form-row-custom(['col-xs-4 col-sm-3 col-md-3'], ['col-xs-8 col-sm-9
col-md-9'], 'selectedPreset')
             .metadata-content(ng-show='loadMeta.action == "schemas"' style='margin-bottom:
50px')
                 table.table.metadata(st-table='loadMeta.displayedSchemas' st-safe-src='loadMeta.schemas')
                     thead

http://git-wip-us.apache.org/repos/asf/ignite/blob/65f74f5f/modules/control-center-web/src/main/js/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata.jade b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
index dc9e019..7117b4d 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata.jade
@@ -65,8 +65,10 @@ include ../includes/controls
             .padding-top-dflt(bs-affix)
                 .panel-tip-container(data-placement='bottom' bs-tooltip='' data-title='Create
new metadata')
                     button.btn.btn-primary(id='new-item' ng-click='createItem()') Add metadata
-                .panel-tip-container(bs-tooltip='' data-title='Load new metadata from database'
data-placement='bottom')
-                    button.btn.btn-primary(ng-click='showLoadMetadataModal()') Load from
database
+                .panel-tip-container(bs-tooltip='' data-title='Load metadata from database'
data-placement='bottom')
+                    button.btn.btn-primary(ng-click='showLoadMetadataModal(false)') Load
from database
+                .panel-tip-container(bs-tooltip='' data-title='Load metadata from demo database'
data-placement='bottom')
+                    button.btn.btn-info(ng-click='showLoadMetadataModal(true)') Load from
demo database
                 +save-remove-buttons('metadata')
             hr
             form.form-horizontal(name='ui.inputForm' ng-show='backupItem && tableVisibleRow((displayedRows
| metadatasValidation:ui.showValid:true), selectedItem)' novalidate unsaved-warning-form)


Mime
View raw message