Merged in julceslau/processmaker (pull request #664)

Merge code from github to bitbucket 2014-08-14 15:23
This commit is contained in:
Julio Cesar Laura Avendaño
2014-08-14 15:25:18 -04:00
2 changed files with 1 additions and 2 deletions

1
.gitignore vendored
View File

@@ -36,4 +36,3 @@ workflow/public_html/build-log.html
temp.txt
update.sh
workflow/public_html/translations/

View File

@@ -320,7 +320,7 @@ class XmlForm_Field
return 1;
}
if(isset($this->mode) && $this->mode == "edit" && (isset($this->owner->values[$this->name]) && $this->owner->values[$this->name] !== "")){
if(isset($this->mode) && $this->mode == "edit" && (isset($this->owner->values[$this->name]) && $this->owner->values[$this->name] !== "") && ($this->type == "text" || $this->type == "currency" || $this->type == "percentage" || $this->type == "textarea" || $this->type == "hidden" || $this->type == "suggest")){
return 1;
}