ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-843 Added ids for tests support.
Date Fri, 28 Aug 2015 07:44:06 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 e448602a8 -> bbc889eb9


IGNITE-843 Added ids for tests support.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bbc889eb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bbc889eb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bbc889eb

Branch: refs/heads/ignite-843
Commit: bbc889eb957a2d872dd87e2aafdca4190a558d4d
Parents: e448602
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Fri Aug 28 14:44:30 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Aug 28 14:44:30 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/models/clusters.json        | 12 ++++++++++++
 .../src/main/js/views/includes/controls.jade            | 10 +++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/bbc889eb/modules/control-center-web/src/main/js/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index 5801591..4899902 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -38,6 +38,7 @@
         },
         {
           "label": "Caches",
+          "id": "caches",
           "type": "dropdown-multiple",
           "model": "caches",
           "placeholder": "Choose caches",
@@ -52,6 +53,7 @@
         },
         {
           "label": "Discovery",
+          "id": "discovery",
           "type": "dropdown-details",
           "settings": false,
           "path": "discovery",
@@ -339,6 +341,7 @@
       "fields": [
         {
           "label": "Cache mode",
+          "id": "cacheMode",
           "type": "dropdown",
           "path": "atomicConfiguration",
           "model": "cacheMode",
@@ -355,6 +358,7 @@
         },
         {
           "label": "Sequence reserve",
+          "id": "atomicSequenceReserveSize",
           "type": "number",
           "path": "atomicConfiguration",
           "model": "atomicSequenceReserveSize",
@@ -366,6 +370,7 @@
         },
         {
           "label": "Backups",
+          "id": "backups",
           "type": "number",
           "path": "atomicConfiguration",
           "model": "backups",
@@ -387,6 +392,7 @@
       "fields": [
         {
           "label": "Timeout",
+          "id": "networkTimeout",
           "type": "number",
           "model": "networkTimeout",
           "placeholder": 5000,
@@ -396,6 +402,7 @@
         },
         {
           "label": "Send retry delay",
+          "id": "networkSendRetryDelay",
           "type": "number",
           "model": "networkSendRetryDelay",
           "placeholder": 1000,
@@ -405,6 +412,7 @@
         },
         {
           "label": "Send retry count",
+          "id": "networkSendRetryCount",
           "type": "number",
           "model": "networkSendRetryCount",
           "placeholder": 3,
@@ -414,6 +422,7 @@
         },
         {
           "label": "Segment check frequency",
+          "id": "segmentCheckFrequency",
           "type": "number",
           "model": "segmentCheckFrequency",
           "placeholder": 10000,
@@ -424,6 +433,7 @@
         },
         {
           "label": "Wait for segment on start",
+          "id": "waitForSegmentOnStart",
           "type": "check",
           "model": "waitForSegmentOnStart",
           "tip": [
@@ -437,6 +447,7 @@
         },
         {
           "label": "Discovery startup delay",
+          "id": "discoveryStartupDelay",
           "type": "number",
           "model": "discoveryStartupDelay",
           "placeholder": 600000,
@@ -456,6 +467,7 @@
       "fields": [
         {
           "label": "Mode",
+          "id": "deploymentMode",
           "type": "dropdown",
           "model": "deploymentMode",
           "placeholder": "SHARED",

http://git-wip-us.apache.org/repos/asf/ignite/blob/bbc889eb/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 08740a5..d526341 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
@@ -259,7 +259,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
         div(ng-switch-when='label')
             label {{::field.label}}
         div.checkbox(ng-switch-when='check' ng-hide=fieldHide)
-            label(id = '{{::field.id}}')
+            label(id='{{::field.id}}')
                 input(type='checkbox' ng-disabled=fieldDisabled)&attributes(fieldCommon)
                 | {{::field.label}}
                 +tipLabel('field.tip')
@@ -280,7 +280,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
             div(class=fieldClasses)
                 +tipField('field.tip')
                 .input-tip
-                    input.form-control(type='password' placeholder='{{::field.placeholder}}')&attributes(fieldCommon)
+                    input.form-control(id='{{::field.id}}' type='password' placeholder='{{::field.placeholder}}')&attributes(fieldCommon)
         div(ng-switch-when='number' ng-hide=fieldHide)
             label(class=lblClasses ng-class=fieldRequiredClass) {{::field.label}}:
             div(class=fieldClasses)
@@ -303,15 +303,15 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
             div(class=fieldClasses)
                 +tipField('field.tip')
                 .input-tip
-                    button.form-control(bs-select ng-disabled='{{field.items}}.length ==
0' data-multiple='1' data-placeholder='{{::field.placeholder}}' bs-options='item.value as
item.label for item in {{field.items}}' tabindex='-1')&attributes(fieldCommon)
+                    button.form-control(id='{{::field.id}}' bs-select ng-disabled='{{field.items}}.length
== 0' data-multiple='1' data-placeholder='{{::field.placeholder}}' bs-options='item.value
as item.label for item in {{field.items}}' tabindex='-1')&attributes(fieldCommon)
         div(ng-switch-when='dropdown-details' ng-hide=fieldHide)
             - var expanded = 'field.details[' + fieldMdl + '].expanded'
 
             label(class=lblClasses ng-class=fieldRequiredClass) {{::field.label}}:
-            div(class=fieldClasses id='{{::field.id}}')
+            div(class=fieldClasses)
                 +tipField('field.tip')
                 .input-tip
-                    button.form-control(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)
+                    button.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)
             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')


Mime
View raw message