You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/08/21 12:08:07 UTC
incubator-ignite git commit: IGNITE-843 Fixed access to form from
controller.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 1d860955e -> 4f89ffb07
IGNITE-843 Fixed access to form from controller.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4f89ffb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f89ffb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f89ffb0
Branch: refs/heads/ignite-843
Commit: 4f89ffb07aae602e6f9ed0b2bdc83edb32534cff
Parents: 1d86095
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Aug 21 17:08:25 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Aug 21 17:08:25 2015 +0700
----------------------------------------------------------------------
.../src/main/js/views/configuration/caches.jade | 2 +-
.../src/main/js/views/configuration/clusters.jade | 2 +-
.../src/main/js/views/configuration/metadata.jade | 2 +-
.../control-center-web/src/main/js/views/includes/controls.jade | 2 +-
modules/control-center-web/src/main/js/views/templates/copy.jade | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f89ffb0/modules/control-center-web/src/main/js/views/configuration/caches.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade
index 27b2832..e35669f 100644
--- a/modules/control-center-web/src/main/js/views/configuration/caches.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade
@@ -31,7 +31,7 @@ block content
.padding-top-dflt
button.btn.btn-primary(on-click-focus='cacheName' ng-click='createItem()') Add cache
hr
- form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)
+ form.form-horizontal(name='ui.inputForm' ng-if='backupItem' novalidate)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true')
+groups('general', 'backupItem')
div(ng-show='ui.expanded')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f89ffb0/modules/control-center-web/src/main/js/views/configuration/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
index 03364a6..fe848a1 100644
--- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade
@@ -34,7 +34,7 @@ block content
button.form-control.line-control(ng-model='template' bs-options='item.value as item.label for item in templates' bs-select)
i.tipLabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}' type='button')
hr
- form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)
+ form.form-horizontal(name='ui.inputForm' ng-if='backupItem' novalidate)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true')
+groups('general', 'backupItem')
div(ng-show='ui.expanded')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f89ffb0/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 f320a12..bcd13ab 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
@@ -32,7 +32,7 @@ block content
button.btn.btn-primary(ng-click='createItem()' on-click-focus='metadataName') Add metadata
button.btn.btn-primary(ng-click='showLoadMetadataModal()') Load from database
hr
- form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)
+ form.form-horizontal(name='ui.inputForm' ng-if='backupItem' novalidate)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true')
+groups('metadata', 'backupItem')
.section
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f89ffb0/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 e3c733f..e02285f 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
@@ -35,7 +35,7 @@ mixin tipLabel(lines)
i.tipLabel.fa.fa-question-circle.blank(ng-if='!#{lines}')
mixin ico-exclamation(mdl, err, msg)
- i.fa.fa-exclamation-triangle.form-control-feedback(ng-show='inputForm["#{mdl}"].$error.#{err}' bs-tooltip data-title='#{msg}' type='button')
+ i.fa.fa-exclamation-triangle.form-control-feedback(ng-show='ui.inputForm["#{mdl}"].$error.#{err}' bs-tooltip data-title='#{msg}' type='button')
mixin btn-save(show, click)
i.tipField.fa.fa-floppy-o(ng-show=show ng-click=click bs-tooltip data-title='Click icon or press [Enter] to save item' data-trigger='hover')
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f89ffb0/modules/control-center-web/src/main/js/views/templates/copy.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/copy.jade b/modules/control-center-web/src/main/js/views/templates/copy.jade
index 8f921d9..888b8ff 100644
--- a/modules/control-center-web/src/main/js/views/templates/copy.jade
+++ b/modules/control-center-web/src/main/js/views/templates/copy.jade
@@ -20,7 +20,7 @@
.modal-header
button.close(type='button' ng-click='$hide()') ×
h4.modal-title Copy
- form.form-horizontal(name='inputForm' novalidate)
+ form.form-horizontal(name='ui.inputForm' novalidate)
.modal-body.row
.col-sm-9.login.col-sm-offset-1
label.required.labelFormField() New name:
@@ -28,4 +28,4 @@
input.form-control(type='text' ng-model='newName' required)
.modal-footer
button.btn.btn-default(type='button' ng-click='$hide()') Cancel
- button.btn.btn-primary(type='button' ng-disabled='inputForm.$invalid' ng-click='ok(newName)') Confirm
+ button.btn.btn-primary(type='button' ng-disabled='ui.inputForm.$invalid' ng-click='ok(newName)') Confirm