提交 70d359cb 编写于 作者: 蔡祥熠

Merge branch 'fix/Process.opinion_not_load' into 'develop'

Merge of fix/Process.opinion_not_load to develop

See merge request o2oa/o2oa!1380
......@@ -1566,10 +1566,10 @@ MWF.xScript.createCMSDict = function(application){
return ar.join("/");
};
this.get = function(path, success, failure, async){
this.get = function(path, success, failure, async, refresh){
var value = null;
if (path){
if (this.dictData[path]){
if ( !refresh && this.dictData[path] ){
if (success) success(this.dictData[path]);
return this.dictData[path];
}
......
......@@ -1662,10 +1662,10 @@ MWF.xScript.createDict = function(application){
return ar.join("/");
};
this.get = function(path, success, failure, async){
this.get = function(path, success, failure, async, refresh){
var value = null;
if (path){
if (this.dictData[path]){
if (!refresh && this.dictData[path]){
if (success) success(this.dictData[path]);
return this.dictData[path];
}
......
......@@ -1379,10 +1379,10 @@ MWF.xScript.createDict = function(application){
return ar.join("/");
};
this.get = function(path, success, failure, async){
this.get = function(path, success, failure, async, refresh){
var value = null;
if (path){
if (this.dictData[path]){
if ( !refresh && this.dictData[path]){
if (success) success(this.dictData[path]);
return this.dictData[path];
}
......
......@@ -1137,10 +1137,10 @@ if( !MWF.xScript.createDict ){
return ar.join("/");
};
this.get = function(path, success, failure, async){
this.get = function(path, success, failure, async, refresh){
var value = null;
if (path){
if (this.dictData[path]){
if (!refresh && this.dictData[path]){
if (success) success(this.dictData[path]);
return this.dictData[path];
}
......
......@@ -179,10 +179,11 @@ MWF.xApplication.process.Xform.Opinion = MWF.APPOpinion = new Class({
}
}.bind(this));
MWF.UD.getDataJson("userOpinion", function(json){
this.userOpinions = json;
}.bind(this), false);
if( !this.form.json.notLoadUserOpinion ){
MWF.UD.getDataJson("userOpinion", function(json){
this.userOpinions = json;
}.bind(this), false);
}
this.node.getFirst().addEvent("input", function(e){
this.startSearchOpinion();
}.bind(this));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册