You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/27 06:58:03 UTC
[13/33] git commit: cloudstack UI - advanced search - use
cloudStack.dialog.createForm()
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/53ab50eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/53ab50eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/53ab50eb
Branch: refs/heads/4.0
Commit: 53ab50eb83c9cc84bb22d178e879ea5d00c31851
Parents: d736863
Author: Jessica Wang <je...@citrix.com>
Authored: Tue Sep 25 16:28:23 2012 -0700
Committer: Edison Su <di...@gmail.com>
Committed: Wed Sep 26 21:50:34 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/53ab50eb/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;