Merge code from github to bitbucket 2014-08-14

2014-08-14 13:53:06 -04:00
parent 9c3d298c26 1c9679d83b
commit 1d89dc5d13
37 changed files with 484 additions and 154 deletions
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -319,6 +319,15 @@ class XmlForm_Field
        if ($this->sql === '') {
            return 1;
        }
+
+        if(isset($this->mode) && $this->mode == "edit" && (isset($this->owner->values[$this->name]) && $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;
+        }
+
        if (! $this->sqlConnection) {
            $this->sqlConnection = 'workflow';
        }