From 10bea168b0c66c356f3a1c0a0f94b6f238b3400f Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Thu, 14 Aug 2014 10:31:47 -0400
Subject: [PATCH] BUG-15198 Problemas con querys en fields.

Se aumenta una validacion para el caso en que el campo este en modo 'edit' y tenga ya datos almacenados, en este caso no se ejecutara el query y se mostrara el valor ya almacenado.
---
 gulliver/js/maborak/core/maborak.js | 2 +-
 gulliver/system/class.xmlform.php   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js
index a2081f8ff..a76fb9ece 100644
--- a/gulliver/js/maborak/core/maborak.js
+++ b/gulliver/js/maborak/core/maborak.js
@@ -1060,7 +1060,7 @@ if(pressKey==46){me.applyMask(256);}
 else{me.applyMask(pressKey);}
 if(updateOnChange){me.sendOnChange();}}
 if(me.browser.name=='Firefox'){if(keyCode==0)return true;}
-alert(me.browser.name);if(me.browser.name=='Microsoft Internet Explorer'||me.browser.name=='Netscape'){alert('explorer1');if(event.preventDefault){alert('***');event.preventDefault();}else{alert('***--***');event.returnValue=false;}}
+if(me.browser.name=='Microsoft Internet Explorer'||me.browser.name=='Netscape'){if(event.preventDefault){event.preventDefault();}else{event.returnValue=false;}}
 if(me.browser.name=='Chrome'||me.browser.name=='Safari'){event.returnValue=false;}
 else{return false;}}};if(this.element){this.element.onblur=function(event)
 {var evt=event||window.event;var keyPressed=evt.which||evt.keyCode;if((me.mask!='')&&((me.mType=='currency')||(me.mType=='percentage')||((me.validate=="Real")&&(me.mType=='text')))&&(me.mask.indexOf('-')==-1)&&(me.element.value!='')){masks=me.mask;aMasks=masks.split(';');for(m=0;m<aMasks.length;m++){var separatorField=",";if(typeof(me.comma_separator)!='undefined'){separatorField=me.comma_separator;}else{txtRealMask=aMasks[m].split('');p=txtRealMask.length-1;for(;p>=0;p--){if(txtRealMask[p]!='#'&&txtRealMask[p]!='%'&&txtRealMask[p]!=' '){separatorField=txtRealMask[p];break;}}}
diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php
index 21c64f3ee..0daf5ee2b 100755
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -320,6 +320,10 @@ class XmlForm_Field
             return 1;
         }
 
+        if(isset($this->mode) && $this->mode == "edit" && ($this->owner->values[$this->name] !== "")){
+        	return 1;
+        }
+
         if(isset($this->mode) && $this->mode == "view" && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")){
         	return 1;
         }