Attribute fix

entity/AttributeRelation_entity/entityfields/attributerelation_value/displayValueProcess.js

@@ -2,10 +2,10 @@ import("system.db");
 import("system.result");
 import("system.vars");
 import("Attribute_lib");
-import("Sql_lib");
 
-var attributeId = vars.get("$field.AB_ATTRIBUTE_ID");
-var attrType = AttributeHandler.begin(attributeId).getAttributeType();
+var attrType = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeType();
 
 if (attrType == $AttributeTypes.COMBO)
-    result.string(AttributeUtil.getSimpleAttributeName(vars.get("$field.ID_VALUE")));  
\ No newline at end of file
+    result.string(AttributeUtil.getSimpleAttributeName(vars.get("$field.ID_VALUE")));
+else
+    result.string(vars.get("$field.ATTRIBUTERELATION_VALUE"));

entity/AttributeRelation_entity/entityfields/attributerelation_value/possibleItemsProcess.js

@@ -14,6 +14,5 @@ if (attrType == $AttributeTypes.COMBO)
         .andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE)
         .buildSql("select AB_ATTRIBUTEID, ATTRIBUTE_NAME from AB_ATTRIBUTE");
     var valueList = db.table(valueSql);
-    
     result.object(valueList);
-}    
\ No newline at end of file
+}

entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js

@@ -8,19 +8,19 @@ if (attrType != null) //load the value from the correct field for the type
 {
     switch (attrType)
     {
-        case $AttributeTypes.TEXT:
+        case $AttributeTypes.TEXT.toString():
             result.string(vars.get("$field.CHAR_VALUE"));
             break;    
-        case $AttributeTypes.DATE:
+        case $AttributeTypes.DATE.toString():
             result.string(vars.get("$field.DATE_VALUE"));
             break;
-        case $AttributeTypes.NUMBER:
+        case $AttributeTypes.NUMBER.toString():
             result.string(vars.get("$field.NUMBER_VALUE"));
             break;
-        case $AttributeTypes.BOOLEAN:
+        case $AttributeTypes.BOOLEAN.toString():
             result.string(vars.get("$field.BOOL_VALUE"));
             break;
-        case $AttributeTypes.COMBO:
+        case $AttributeTypes.COMBO.toString():
             result.string(vars.get("$field.ID_VALUE"));
             break;            
     }

process/Attribute_lib/process.js

@@ -204,43 +204,50 @@ AttributeHandler.prototype.setAttributeValue = function (pValue)
 function $AttributeTypes () {}
 
 $AttributeTypes.TEXT = { 
-    toString : function () {return "TEXT"},
+    toString : function () {return this.keyword},
+    keyword : "TEXT",
     contentType : "TEXT", 
     databaseField : "CHAR_VALUE", 
     entityField : "CHAR_VALUE"
 };
 $AttributeTypes.DATE = {
-    toString : function () {return "DATE"},
+    toString : function () {return this.keyword},
+    keyword : "DATE",
     contentType : "DATE", 
     databaseField : "DATE_VALUE", 
     entityField : "DATE_VALUE"
 };
 $AttributeTypes.NUMBER = {
-    toString : function () {return "NUMBER"},
+    toString : function () {return this.keyword},
+    keyword : "NUMBER",
     contentType : "NUMBER", 
     databaseField : "NUMBER_VALUE", 
     entityField : "NUMBER_VALUE"
 };
 $AttributeTypes.BOOLEAN = {
-    toString : function () {return "BOOLEAN"},
+    toString : function () {return this.keyword},
+    keyword : "BOOLEAN",
     contentType : "BOOLEAN", 
     databaseField : "BOOL_VALUE", 
     entityField : "BOOL_VALUE"
 };
 $AttributeTypes.COMBO = {
-    toString : function () {return "COMBO"},
+    toString : function () {return this.keyword},
+    keyword : "COMBO",
     contentType : "TEXT", 
     databaseField : "ID_VALUE", 
     entityField : "ID_VALUE"
 };
 $AttributeTypes.COMBOVALUE = {
-    toString : function () {return "COMBOVALUE"},
+    toString : function () {return this.keyword},
+    keyword : "COMBOVALUE",
     contentType : null, 
     databaseField : null, 
     entityField : null
 };
 $AttributeTypes.GROUP = {
-    toString : function () {return "GROUP"},
+    toString : function () {return this.keyword},
+    keyword : "GROUP",
     contentType : null, 
     databaseField : null, 
     entityField : null