|
|
@@ -101,6 +101,8 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
|
|
|
this.createScriptArea(scriptValueArea);
|
|
|
}
|
|
|
|
|
|
+ this.multiValueNoticeNode = this.inputAreaNode.getElement(".multiValueNotice_vf");
|
|
|
+
|
|
|
this.titleInput = this.inputAreaNode.getElement(".titleInput_vf");
|
|
|
this.pathInput = this.inputAreaNode.getElement(".pathInput_vf");
|
|
|
this.datatypeInput = this.inputAreaNode.getElement(".datatypeInput_vf");
|
|
|
@@ -264,8 +266,7 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
|
|
|
"greaterThanOrEqualTo": {},
|
|
|
"lessThan": {},
|
|
|
"lessThanOrEqualTo": {},
|
|
|
- "range": {},
|
|
|
- "in": {}
|
|
|
+ "range": {}
|
|
|
},
|
|
|
"dateTimeValue": {
|
|
|
"equals": {
|
|
|
@@ -288,9 +289,6 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
|
|
|
},
|
|
|
"range": {
|
|
|
"invalidValue" : ["@year","@season","@month","@time","@date"]
|
|
|
- },
|
|
|
- "in": {
|
|
|
- "invalidValue" : ["@year","@season","@month","@time","@date"]
|
|
|
}
|
|
|
},
|
|
|
"dateValue": {
|
|
|
@@ -314,9 +312,6 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
|
|
|
},
|
|
|
"range": {
|
|
|
"invalidValue" : ["@year","@season","@month","@date"]
|
|
|
- },
|
|
|
- "in": {
|
|
|
- "invalidValue" : ["@year","@season","@month","@date"]
|
|
|
}
|
|
|
},
|
|
|
"timeValue": {
|
|
|
@@ -340,9 +335,6 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
|
|
|
},
|
|
|
"range": {
|
|
|
"invalidValue" : ["@time"]
|
|
|
- },
|
|
|
- "in": {
|
|
|
- "invalidValue" : ["@time"]
|
|
|
}
|
|
|
},
|
|
|
"booleanValue": {
|
|
|
@@ -367,6 +359,11 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
|
|
|
var options = this.comparisonInput.options;
|
|
|
|
|
|
var comparison = options[this.comparisonInput.selectedIndex].value;
|
|
|
+ if( availableComparisonList.contains( "in" ) && comparison === "in" ){
|
|
|
+ if(this.multiValueNoticeNode)this.multiValueNoticeNode.show()
|
|
|
+ }else{
|
|
|
+ if(this.multiValueNoticeNode)this.multiValueNoticeNode.hide()
|
|
|
+ }
|
|
|
|
|
|
if( !this.originalComparisonOptions ){
|
|
|
this.originalComparisonOptions = [];
|