You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/10/22 09:54:08 UTC
ignite git commit: IGNITE-1712 Disable user, password for test-drive
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 e54d4e5ba -> 030ef46d3
IGNITE-1712 Disable user, password for test-drive
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/030ef46d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/030ef46d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/030ef46d
Branch: refs/heads/ignite-843-rc1
Commit: 030ef46d33be1ab8d75e5c40d90e99220bc6e249
Parents: e54d4e5
Author: Andrey <an...@gridgain.com>
Authored: Thu Oct 22 14:54:30 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Oct 22 14:54:30 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/metadata-controller.js | 9 ++++++++-
.../src/main/js/controllers/models/metadata.json | 2 ++
.../src/main/js/views/includes/controls.jade | 16 ++++++++--------
3 files changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/030ef46d/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index 08f4ae0..85cd920 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -309,7 +309,14 @@ consoleModule.controller('metadataController', [
function _loadSchemas() {
$loading.start('loadingMetadataFromDb');
- $http.post('/agent/schemas', $scope.preset)
+ var preset = angular.copy($scope.preset);
+
+ if (preset.jdbcUrl == 'jdbc:h2:mem:test-drive-db') {
+ preset.user = 'sa';
+ preset.password = '';
+ }
+
+ $http.post('/agent/schemas', preset)
.success(function (schemas) {
$scope.loadMeta.schemas = _.map(schemas, function (schema) { return {use: false, name: schema}});
$scope.loadMeta.action = 'schemas';
http://git-wip-us.apache.org/repos/asf/ignite/blob/030ef46d/modules/control-center-web/src/main/js/controllers/models/metadata.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/metadata.json b/modules/control-center-web/src/main/js/controllers/models/metadata.json
index 37598dc..f56af9b 100644
--- a/modules/control-center-web/src/main/js/controllers/models/metadata.json
+++ b/modules/control-center-web/src/main/js/controllers/models/metadata.json
@@ -249,6 +249,7 @@
"label": "User",
"id": "user",
"type": "text",
+ "disabled": "preset.jdbcUrl == 'jdbc:h2:mem:test-drive-db'",
"model": "user",
"tip": [
"User name for connecting to database"
@@ -258,6 +259,7 @@
"label": "Password",
"id": "password",
"type": "password",
+ "disabled": "preset.jdbcUrl == 'jdbc:h2:mem:test-drive-db'",
"model": "password",
"onEnter": "loadMetadataNext()",
"tip": [
http://git-wip-us.apache.org/repos/asf/ignite/blob/030ef46d/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 2bce523..c5d936e 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
@@ -271,7 +271,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
- var fieldCommon = {'ng-model': fieldMdl, 'ng-required': 'field.required || required(field)'};
- var fieldRequiredClass = '{true: "required"}[field.required || required(field)]'
- var fieldHide = '{{field.hide}}'
- - var fieldDisabled = '{{field.disabled}}'
+ - var fieldDisabled = {'ng-disabled': '{{field.disabled}}'}
- var dropdownPlaceholder = {'ng-class': '{placeholder: !' + fieldMdl + ' || ' + fieldMdl + '.length == 0}'}
div(ng-switch='field.type')
@@ -279,7 +279,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
label {{::field.label}}
div.checkbox(ng-switch-when='check' ng-hide=fieldHide)
label(id='{{::field.id}}')
- input(type='checkbox' ng-disabled=fieldDisabled)&attributes(fieldCommon)
+ input(type='checkbox')&attributes(fieldCommon)&attributes(fieldDisabled)
| {{::field.label}}
+tipLabel('field.tip')
div(ng-switch-when='text' ng-hide=fieldHide)
@@ -287,7 +287,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
div(class=fieldClasses)
+tipField('field.tip')
.input-tip
- input.form-control(id='{{::field.id}}' type='text' ng-disabled=fieldDisabled placeholder='{{::field.placeholder}}' ng-focus='tableReset()')&attributes(fieldCommon)
+ input.form-control(id='{{::field.id}}' type='text' placeholder='{{::field.placeholder}}' ng-focus='tableReset()')&attributes(fieldCommon)&attributes(fieldDisabled)
div(ng-switch-when='typeahead' ng-hide=fieldHide)
label(class=lblClasses ng-class=fieldRequiredClass) {{::field.label}}:
div(class=fieldClasses)
@@ -299,7 +299,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
div(class=fieldClasses)
+tipField('field.tip')
.input-tip
- input.form-control(id='{{::field.id}}' type='password' placeholder='{{::field.placeholder}}' on-enter='{{::field.onEnter}}')&attributes(fieldCommon)
+ input.form-control(id='{{::field.id}}' type='password' placeholder='{{::field.placeholder}}' on-enter='{{::field.onEnter}}')&attributes(fieldCommon)&attributes(fieldDisabled)
div(ng-switch-when='number' ng-hide=fieldHide)
label(class=lblClasses ng-class=fieldRequiredClass) {{::field.label}}:
div(class=fieldClasses)
@@ -314,7 +314,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
div(class=fieldClasses)
+tipField('field.tip')
.input-tip
- button.select-toggle.form-control(id='{{::field.id}}' bs-select ng-disabled=fieldDisabled data-placeholder='{{::field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}' ng-attr-data-container='{{::field.container}}' tabindex='0')&attributes(fieldCommon)&attributes(dropdownPlaceholder)
+ button.select-toggle.form-control(id='{{::field.id}}' bs-select data-placeholder='{{::field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}' ng-attr-data-container='{{::field.container}}' tabindex='0')&attributes(fieldCommon)&attributes(dropdownPlaceholder)&attributes(fieldDisabled)
div(ng-switch-when='dropdown-multiple' ng-hide=fieldHide)
dic(class=lblClasses)
label(ng-class=fieldRequiredClass) {{::field.label}}:
@@ -330,7 +330,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
div(class=fieldClasses)
+tipField('field.tip')
.input-tip
- button.select-toggle.form-control(id='{{::field.id}}' bs-select ng-disabled=fieldDisabled data-placeholder='{{::field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}' tabindex='0')&attributes(fieldCommon)&attributes(dropdownPlaceholder)
+ button.select-toggle.form-control(id='{{::field.id}}' bs-select data-placeholder='{{::field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}' tabindex='0')&attributes(fieldCommon)&attributes(dropdownPlaceholder)&attributes(fieldDisabled)
a.customize(ng-if='#{fieldMdl} && field.settings && field.details[#{fieldMdl}].fields.length > 0' ng-click='#{expanded} = !#{expanded}') {{#{expanded} ? 'Hide settings' : 'Show settings'}}
.col-sm-12.panel-details(ng-show='(#{expanded} || !field.settings) && #{fieldMdl}')
.details-row(ng-repeat='detail in field.details[#{fieldMdl}].fields')
@@ -507,9 +507,9 @@ mixin save-remove-buttons(objectName)
div(ng-show='tableVisibleRow(displayedRows, selectedItem)' style='display: inline-block;')
.panel-tip-container(ng-hide='!backupItem || backupItem._id')
- a.btn.btn-primary(ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? saveItem() : ""' bs-tooltip='' data-title='{{saveBtnTipText(ui.isDirty(), "#{objectName}")}}' data-placement='bottom' data-trigger='hover') Save
+ a.btn.btn-primary(ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? saveItem() : ""' bs-tooltip data-title='{{saveBtnTipText(ui.isDirty(), "#{objectName}")}}' data-placement='bottom' data-trigger='hover') Save
.panel-tip-container(ng-show='backupItem._id')
- a.btn.btn-primary(id='save-item' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? saveItem() : ""' bs-tooltip='' data-title='{{saveBtnTipText(ui.isDirty(), "#{objectName}")}}' data-placement='bottom' data-trigger='hover') Save
+ a.btn.btn-primary(id='save-item' ng-disabled='!ui.isDirty()' ng-click='ui.isDirty() ? saveItem() : ""' bs-tooltip data-title='{{saveBtnTipText(ui.isDirty(), "#{objectName}")}}' data-placement='bottom' data-trigger='hover') Save
.panel-tip-container(ng-show='backupItem._id')
a.btn.btn-primary(id='clone-item' ng-click='cloneItem()' bs-tooltip=cloneTip data-placement='bottom' data-trigger='hover') Clone
.btn-group.panel-tip-container(ng-show='backupItem._id')