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/23 12:07:05 UTC
[1/2] ignite git commit: IGNITE-1597 Fixed filtering
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 723021fb2 -> b3bfd9db6
IGNITE-1597 Fixed filtering
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e224c43b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e224c43b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e224c43b
Branch: refs/heads/ignite-843-rc1
Commit: e224c43bc9de9eef1629153a003d7c7451b93115
Parents: dd42dbb
Author: Andrey <an...@gridgain.com>
Authored: Fri Oct 23 17:06:35 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Oct 23 17:06:35 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/metadata-controller.js | 7 +------
.../src/main/js/views/configuration/metadata.jade | 8 ++++----
2 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e224c43b/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 85cd920..437555c 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
@@ -677,12 +677,7 @@ consoleModule.controller('metadataController', [
};
$scope.metadataTitle = function () {
- var validFilter = $filter('metadatasValidation');
-
- if ($scope.ui.showValid || validFilter($scope.displayedRows, false, true).length == 0)
- return 'Types metadata:';
-
- return 'Type metadata without key fields:';
+ return $scope.ui.showValid ? 'Types metadata:' : 'Type metadata without key fields:';
};
function selectFirstItem() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/e224c43b/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 c268bb9..db297e3 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
@@ -38,7 +38,7 @@ block content
lable.labelHeader.labelFormField {{metadataTitle()}}
.col-sm-8.pull-right(style='padding: 0')
.col-sm-6
- .pull-right.labelLogin.additional-filter(ng-if='(displayedRows | metadatasValidation:false:true).length > 0')
+ .pull-right.labelLogin.additional-filter(ng-if='(metadatas | metadatasValidation:false:true).length > 0')
a.labelFormField(ng-if='ui.showValid' ng-click='ui.showValid = !ui.showValid') Key fields should be configured: {{(displayedRows | metadatasValidation:false:true).length}} 
a.labelFormField(ng-if='!ui.showValid' ng-click='ui.showValid = !ui.showValid') Show all metadata: {{displayedRows.length}} 
.col-sm-6
@@ -46,13 +46,13 @@ block content
tbody
tr
td
- .scrollable-y(ng-show='displayedRows.length > 0' style='max-height: 200px')
+ .scrollable-y(ng-show='(displayedRows | metadatasValidation:ui.showValid:true).length > 0' style='max-height: 200px')
table
tbody
tr(ng-repeat='row in (displayedRows | metadatasValidation:ui.showValid:true) track by row._id')
td
a(ng-class='{active: row._id == selectedItem._id}' ng-click='selectItem(row)') {{$index + 1}}) {{row.valueType}}
- label.placeholder(ng-show='displayedRows.length == 0') No metadata found
+ label.placeholder(ng-show='(displayedRows | metadatasValidation:ui.showValid:true).length == 0') No metadata found
.padding-top-dflt(bs-affix)
.panel-tip-container(data-placement='bottom' bs-tooltip data-title='Create new metadata')
button.btn.btn-primary(id='new-item' ng-click='createItem()') Add metadata
@@ -60,7 +60,7 @@ block content
button.btn.btn-primary(ng-click='showLoadMetadataModal()') Load from database
+save-remove-buttons('metadata')
hr
- form.form-horizontal(name='ui.inputForm' ng-if='backupItem && tableVisibleRow(displayedRows, selectedItem)' novalidate unsaved-warning-form)
+ form.form-horizontal(name='ui.inputForm' ng-if='backupItem && tableVisibleRow((displayedRows | metadatasValidation:ui.showValid:true), selectedItem)' novalidate unsaved-warning-form)
.panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true')
+groups('metadata', 'backupItem')
.section
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc1' into ignite-843-rc1
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3bfd9db
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3bfd9db
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3bfd9db
Branch: refs/heads/ignite-843-rc1
Commit: b3bfd9db611008d4831abf629f3fb680bbb812ea
Parents: e224c43 723021f
Author: Andrey <an...@gridgain.com>
Authored: Fri Oct 23 17:06:57 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Oct 23 17:06:57 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/models/igfs.json | 8 +++-
.../src/main/js/views/includes/controls.jade | 45 ++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
----------------------------------------------------------------------