From e390b9be15a05a1b0fc46da0fc7381be3d37ec92 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 18 May 2012 11:48:18 +0530 Subject: [PATCH] added search button in filters --- js/core.min.js | 4 +++- js/wn/ui/filters.js | 4 +++- js/wn/ui/listing.js | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/js/core.min.js b/js/core.min.js index e8b6500088..fdf02ad2bd 100644 --- a/js/core.min.js +++ b/js/core.min.js @@ -148,6 +148,8 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\
\
\
\ + \ \
\ @@ -194,7 +196,7 @@ if(this.onrun)this.onrun();if(this.callback)this.callback(r);},render_list:funct /* * lib/js/wn/ui/filters.js */ -wn.ui.FilterList=Class.extend({init:function(opts){wn.require('lib/js/legacy/widgets/form/fields.js');$.extend(this,opts);this.filters=[];this.$w=this.$parent;this.set_events();},set_events:function(){var me=this;this.$w.find('.add-filter-btn').bind('click',function(){me.add_filter();});},show_filters:function(){this.$w.find('.show_filters').toggle();if(!this.filters.length) +wn.ui.FilterList=Class.extend({init:function(opts){wn.require('lib/js/legacy/widgets/form/fields.js');$.extend(this,opts);this.filters=[];this.$w=this.$parent;this.set_events();},set_events:function(){var me=this;this.$w.find('.add-filter-btn').bind('click',function(){me.add_filter();});this.$w.find('.search-btn').bind('click',function(){me.listobj.run();});},show_filters:function(){this.$w.find('.show_filters').toggle();if(!this.filters.length) this.add_filter();},add_filter:function(fieldname,condition,value){this.filters.push(new wn.ui.Filter({flist:this,fieldname:fieldname,condition:condition,value:value}));if(fieldname){this.$w.find('.show_filters').toggle(true);}},get_filters:function(){var values=[];$.each(this.filters,function(i,f){if(f.field) values.push(f.get_value());}) return values;},update_filters:function(){var fl=[];$.each(this.filters,function(i,f){if(f.field)fl.push(f);}) diff --git a/js/wn/ui/filters.js b/js/wn/ui/filters.js index df35e5d0f4..79825f6c89 100644 --- a/js/wn/ui/filters.js +++ b/js/wn/ui/filters.js @@ -34,7 +34,9 @@ wn.ui.FilterList = Class.extend({ this.$w.find('.add-filter-btn').bind('click', function() { me.add_filter(); }); - + this.$w.find('.search-btn').bind('click', function() { + me.listobj.run(); + }); }, show_filters: function() { diff --git a/js/wn/ui/listing.js b/js/wn/ui/listing.js index 11de8b1215..fcd28f24ae 100644 --- a/js/wn/ui/listing.js +++ b/js/wn/ui/listing.js @@ -87,6 +87,8 @@ wn.ui.Listing = Class.extend({
\
\
\ + \ \
\ @@ -165,6 +167,7 @@ wn.ui.Listing = Class.extend({ this.add_button('Refresh', function() { me.run(); }, 'icon-refresh'); + } // new