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/07/23 10:40:40 UTC

[09/50] [abbrv] incubator-ignite git commit: IGNITE-843: WIP: groups.

IGNITE-843: WIP: groups.


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

Branch: refs/heads/ignite-1121
Commit: 18f554d8348a5e8f168d08708716b0490b183a00
Parents: 3ab9a91
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Jul 21 00:49:29 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Jul 21 00:49:29 2015 +0700

----------------------------------------------------------------------
 .../nodejs/controllers/metadata-controller.js             |  4 ++++
 .../nodejs/views/includes/controls.jade                   | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18f554d8/modules/web-control-center/nodejs/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/metadata-controller.js b/modules/web-control-center/nodejs/controllers/metadata-controller.js
index 5f20fb2..9b100af 100644
--- a/modules/web-control-center/nodejs/controllers/metadata-controller.js
+++ b/modules/web-control-center/nodejs/controllers/metadata-controller.js
@@ -455,6 +455,10 @@ controlCenterModule.controller('metadataController', ['$scope', '$http', '$commo
             $table.tableReset();
         };
 
+        $scope.tableGroupSaveVisible = function(group) {
+            return $common.isNonEmpty(group);
+        };
+
         $scope.tableRemoveGroupItem = function(group, index) {
             console.log("group: " + group.name);
             console.log("index: " + index);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18f554d8/modules/web-control-center/nodejs/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/includes/controls.jade b/modules/web-control-center/nodejs/views/includes/controls.jade
index ce476d7..aaed1a1 100644
--- a/modules/web-control-center/nodejs/views/includes/controls.jade
+++ b/modules/web-control-center/nodejs/views/includes/controls.jade
@@ -276,8 +276,14 @@ mixin form-row-custom(lblClasses, fieldClasses)
                     tr.col-sm-12(ng-repeat='group in #{fieldMdl}')
                         td.col-sm-6
                             div
-                                a.labelFormField(ng-click='curGroup = tableStartEdit(backupItem, field, $index); curName = curGroup.name; curFields = curGroup.fields') {{$index + 1}}) {{group.name}}
-                                +btn-remove('tableRemove(backupItem, field, $index)')
+                                div(ng-show='!tableEditing(field, $index)')
+                                    a.labelFormField(ng-click='curGroup = tableStartEdit(backupItem, field, $index); curName = curGroup.name; curFields = curGroup.fields') {{$index + 1}}) {{group.name}}
+                                    +btn-remove('tableRemove(backupItem, field, $index)')
+                                div(ng-show='tableEditing(field, $index)')
+                                    label.labelField {{$index + 1}})
+                                    +btn-save('tableGroupSaveVisible(curName)', 'tableGroupSave(field, curDbName, curDbType, curJavaName, curJavaType, $index)')
+                                    .input-tip
+                                        input.form-control(type='text' ng-model='curName' placeholder='Index name')
                                 table.links-edit.col-sm-12(st-table='group.fields' ng-show='group.fields.length > 0')
                                     tr(ng-repeat='groupItem in group.fields')
                                         td