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 2018/10/11 04:40:06 UTC

ignite git commit: IGNITE-9809 Web Console: Added possibility to disable multiselect filter in ui-grid column definitions.

Repository: ignite
Updated Branches:
  refs/heads/master f313d6504 -> bc62ed44d


IGNITE-9809 Web Console: Added possibility to disable multiselect filter in ui-grid column definitions.


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

Branch: refs/heads/master
Commit: bc62ed44d50f9ebf8e1a873f96a7aeeecb86a6ca
Parents: f313d65
Author: Alexander Kalinin <ve...@yandex.ru>
Authored: Thu Oct 11 11:39:29 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Oct 11 11:39:29 2018 +0700

----------------------------------------------------------------------
 .../frontend/app/components/ui-grid-filters/template.pug          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/bc62ed44/modules/web-console/frontend/app/components/ui-grid-filters/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ui-grid-filters/template.pug b/modules/web-console/frontend/app/components/ui-grid-filters/template.pug
index 4cdcc87..a865395 100644
--- a/modules/web-console/frontend/app/components/ui-grid-filters/template.pug
+++ b/modules/web-console/frontend/app/components/ui-grid-filters/template.pug
@@ -27,6 +27,7 @@
                 type='button'
                 title='{{ colFilter.$$multiselectFilterTooltip() }}'
                 ng-model='colFilter.term'
+                ng-disabled='col.colDef.multiselectFilterDisabled'
                 bs-select
                 bs-options='option.value as option.label for option in colFilter.selectOptions'
                 data-multiple='true'
@@ -41,7 +42,7 @@
                 }`
                 ng-click='colFilter.selectDialog(grid, colFilter)'
                 type='button'
-                title='{{ colFilter.$$multiselectFilterTooltip() }}'               
+                title='{{ colFilter.$$multiselectFilterTooltip() }}'
             ) {{ col.displayName }}
 
     .ui-grid-cell-contents(role='button')