Updated Branches: refs/heads/master 32feb9525 -> 645527dbf
cloudstack UI - advanced search - use cloudStack.dialog.createForm() Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/645527db Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/645527db Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/645527db Branch: refs/heads/master Commit: 645527dbf7921cf7a64f86d3dfe358507cf7f6b8 Parents: 32feb95 Author: Jessica Wang <[email protected]> Authored: Tue Sep 25 16:28:23 2012 -0700 Committer: Jessica Wang <[email protected]> Committed: Tue Sep 25 16:31:05 2012 -0700 ---------------------------------------------------------------------- ui/scripts/ui/widgets/listView.js | 55 ++++++++++++++++++++++++++------ 1 files changed, 45 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/645527db/ui/scripts/ui/widgets/listView.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js index 7183e93..c334f2e 100644 --- a/ui/scripts/ui/widgets/listView.js +++ b/ui/scripts/ui/widgets/listView.js @@ -670,8 +670,7 @@ var $searchBar = $('<div></div>').addClass('search-bar reduced hide').appendTo($search); $searchBar.append('<input type="text" />'); $search.append('<div id="basic_search" class="button search"></div>'); - //$search.append('<div id="advanced_search" class="button search"></div>'); - + //$search.append('<div id="advanced_search" class="button search"></div>'); return $search.appendTo($toolbar); }; @@ -1317,6 +1316,7 @@ return true; }); + //basic search var basicSearch = function() { page = 1; loadBody( @@ -1342,8 +1342,7 @@ } ); }; - - //basic search + $listView.find('.search-bar input[type=text]').keyup(function(event) { if(event.keyCode == 13) //13 is keycode of Enter key basicSearch(); @@ -1367,13 +1366,49 @@ return true; }); - //advanced search - /* - $listView.find('.button.search#advanced_search').bind('click', function(event) { - return true; + //advanced search + var advancedSearch = function(args) { + page = 1; + loadBody( + $table, + listViewData.dataProvider, + listViewData.preFilter, + listViewData.fields, + false, + { + page: page, + filterBy: { + kind: $listView.find('select[id=filterBy]').val(), + search: { + value: args.data.name, + by: 'name' + } + } + }, + listViewData.actions, + { + context: $listView.data('view-args').context, + reorder: listViewData.reorder + } + ); + }; + + $listView.find('.button.search#advanced_search').bind('click', function(event) { + cloudStack.dialog.createForm({ + form: { + title: 'Advanced Search', + fields: { + name: { label: 'Name' } + } + }, + after: function(args) { + advancedSearch(args); + } + }); + + return false; }); - */ - + // Infinite scrolling event $listView.bind('scroll', function(event) { if (args.listView && args.listView.disableInfiniteScrolling) return false;
