Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 f3da5e70b -> 266c83a32
# IGNITE-843 WIP on panel with edit and table. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/266c83a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/266c83a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/266c83a3 Branch: refs/heads/ignite-843 Commit: 266c83a3267fd2543ca00c15313166c1b53fe0b2 Parents: f3da5e7 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue Jun 16 17:23:14 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue Jun 16 17:23:14 2015 +0700 ---------------------------------------------------------------------- modules/webconfig/nodejs/public/form-models/caches.json | 3 ++- modules/webconfig/nodejs/views/includes/controls.jade | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/266c83a3/modules/webconfig/nodejs/public/form-models/caches.json ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/public/form-models/caches.json b/modules/webconfig/nodejs/public/form-models/caches.json index d8fc889..390f630 100644 --- a/modules/webconfig/nodejs/public/form-models/caches.json +++ b/modules/webconfig/nodejs/public/form-models/caches.json @@ -355,9 +355,10 @@ { "tableLabel": "SQL functions", "label": "SQL function", - "type": "zzz", + "type": "table-simple2", "model": "sqlFunctionClasses", "editIdx": -1, + "placeholder": "Some placeholder", "tip": [ "Classes with user-defined functions for SQL queries" ] http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/266c83a3/modules/webconfig/nodejs/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/includes/controls.jade b/modules/webconfig/nodejs/views/includes/controls.jade index 2a8ba51..aa2e85b 100644 --- a/modules/webconfig/nodejs/views/includes/controls.jade +++ b/modules/webconfig/nodejs/views/includes/controls.jade @@ -128,7 +128,7 @@ mixin form-row td a(ng-click='editIndexedTypes($index)') {{$index + 1}}. {{idxType.keyClass}}, {{idxType.valueClass}} label.fa.fa-remove(ng-click='removeIndexedType($index)') - div(ng-switch-when='zzz' ) + div(ng-switch-when='table-simple2' ) div label SQL functions: {{backupItem.sqlFunctionClasses.length}} +tipLabel('field.tip') @@ -143,9 +143,9 @@ mixin form-row i.tipField.fa.fa-remove(ng-show='field.editIdx != {{$index}}' ng-click='field.editIdx = -1; removeSqlFunction($index)') i.tipField.fa.fa-floppy-o(ng-show='field.editIdx == {{$index}}' ng-click='field.editIdx = -1; backupItem.sqlFunctionClasses[$index]=inplaceSqlFx') td.col-sm-1 - i.fa.fa-arrow-up - i.fa.fa-arrow-down + i.fa.fa-arrow-up(ng-show='{{$index}} > 0' ng-click='field.editIdx = -1') + i.fa.fa-arrow-down(ng-show='{{$index}} < #{sqlFunctions}.length - 1' ng-click='field.editIdx = -1') .col-sm-5 input.form-control(type='text' ng-model='newSqlFx' placeholder='SQL function class name') - button.btn.btn-primary(style='margin-left: 10px;' ng-click='addSqlFunction(newSqlFx)') Add SQL function + button.btn.btn-primary(style='margin-left: 10px;' ng-click='field.editIdx = -1; addSqlFunction(newSqlFx)') Add SQL function
