Merge branch 'master' of git://github.com/colosa/processmaker into BUG-0000

This commit is contained in:
Victor Saisa Lopez
2013-04-25 09:11:58 -04:00

View File

@@ -366,7 +366,7 @@ var dynaformEditor={
var todoRefreshXmlCode = xmlCode === null; var todoRefreshXmlCode = xmlCode === null;
if (todoRefreshXmlCode) return; if (todoRefreshXmlCode) return;
var res = this.ajax.set_xmlcode(this.A, encodeURIComponent(xmlCode)); var res = this.ajax.set_xmlcode(this.A, encodeURIComponent(xmlCode));
if (res!=="") G.alert(res); if (res!=="" && typeof(res) == 'string') G.alert(res);
this.responseAction = true; this.responseAction = true;
} else { } else {
this.responseAction = false; this.responseAction = false;
@@ -378,8 +378,10 @@ var dynaformEditor={
var response = this.ajax.set_htmlcode(this.A, tinyMCE.activeEditor.getContent()); var response = this.ajax.set_htmlcode(this.A, tinyMCE.activeEditor.getContent());
if (response) { if (response) {
G.alert(response["*message"],"Error"); if (typeof(response["*message"]) != 'undefined') {
this.responseAction = false; G.alert(response["*message"],"Error");
this.responseAction = false;
}
} else { } else {
this.responseAction = true; this.responseAction = true;
} }