From bd2b891f92d52cd889495edc88b9adba9934d9c3 Mon Sep 17 00:00:00 2001
From: Akhilesh Darjee <akhileshdarjee@gmail.com>
Date: Tue, 14 Jan 2014 13:09:37 +0530
Subject: [PATCH] set default condition only if not conditions in filters

---
 public/js/wn/ui/filters.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/js/wn/ui/filters.js b/public/js/wn/ui/filters.js
index 15735782ce..3178cacac2 100644
--- a/public/js/wn/ui/filters.js
+++ b/public/js/wn/ui/filters.js
@@ -145,7 +145,8 @@ wn.ui.Filter = Class.extend({
 					me.field.desc_area = $a(me.field.wrapper, 'span', 'help', null,
 						'values separated by comma');				
 			} else {
-				me.set_field(me.field.df.parent, me.field.df.fieldname);				
+				me.set_field(me.field.df.parent, me.field.df.fieldname, null, 
+					me.$w.find('.condition').val());				
 			}
 		});
 		
@@ -166,7 +167,7 @@ wn.ui.Filter = Class.extend({
 		if(value!=null) this.field.set_input(value);
 	},
 	
-	set_field: function(tablename, fieldname, fieldtype) {
+	set_field: function(tablename, fieldname, fieldtype, condition) {
 		var me = this;
 		
 		// set in fieldname (again)
@@ -212,7 +213,7 @@ wn.ui.Filter = Class.extend({
 		if(old_text) 
 			me.field.set_input(old_text);
 		
-		this.set_default_condition(df, fieldtype);
+		if(!condition) this.set_default_condition(df, fieldtype);
 		
 		$(me.field.wrapper).find(':input').keydown(function(ev) {
 			if(ev.which==13) {