midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3738 Reference Color broken

This commit is contained in:
Nicolas Micoud 2018-07-04 16:16:19 +02:00
parent 2cf832fc43
commit 6fbb57307d
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.base/src/org/compiere/model/MColumn.java
View File

@ -743,8 +743,6 @@ public class MColumn extends X_AD_Column
foreignTable = "S_ResourceAssignment"; foreignTable = "S_ResourceAssignment";
} else if (DisplayType.Image == refid) { } else if (DisplayType.Image == refid) {
foreignTable = "AD_Image"; foreignTable = "AD_Image";
} else if (DisplayType.Color == refid) {
foreignTable = "AD_Color";
} else if (DisplayType.Chart == refid) { } else if (DisplayType.Chart == refid) {
foreignTable = "AD_Chart"; foreignTable = "AD_Chart";
} }

11
org.adempiere.base/src/org/compiere/util/DisplayType.java
View File

@ -199,7 +199,7 @@ public final class DisplayType
if (displayType == ID || displayType == Table || displayType == TableDir if (displayType == ID || displayType == Table || displayType == TableDir
|| displayType == Search || displayType == Location || displayType == Locator || displayType == Search || displayType == Location || displayType == Locator
|| displayType == Account || displayType == Assignment || displayType == PAttribute || displayType == Account || displayType == Assignment || displayType == PAttribute
|| displayType == Image || displayType == Chart || displayType == Color) || displayType == Image || displayType == Chart)
return true; return true;
List<IDisplayTypeFactory> factoryList = Service.locator().list(IDisplayTypeFactory.class).getServices(); List<IDisplayTypeFactory> factoryList = Service.locator().list(IDisplayTypeFactory.class).getServices();
@ -622,13 +622,8 @@ public final class DisplayType
else else
return "VARCHAR2(" + fieldLength + ")"; return "VARCHAR2(" + fieldLength + ")";
} }
if (displayType == DisplayType.Color) // this condition is never reached - filtered above in isID if (displayType == DisplayType.Color)
{ return "VARCHAR2(" + fieldLength + ")";
if (columnName.endsWith("_ID"))
return "NUMBER(10)";
else
return "CHAR(" + fieldLength + ")";
}
if (displayType == DisplayType.Button) if (displayType == DisplayType.Button)
{ {
if (columnName.endsWith("_ID")) if (columnName.endsWith("_ID"))

2
org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java
View File

@ -925,7 +925,6 @@ public class DB_Oracle implements AdempiereDatabase
// IDs // IDs
case DisplayType.Account: case DisplayType.Account:
case DisplayType.Assignment: case DisplayType.Assignment:
case DisplayType.Color:
case DisplayType.ID: case DisplayType.ID:
case DisplayType.Location: case DisplayType.Location:
case DisplayType.Locator: case DisplayType.Locator:
@ -979,6 +978,7 @@ public class DB_Oracle implements AdempiereDatabase
break; break;
// NVARCHAR // NVARCHAR
case DisplayType.Color:
case DisplayType.Memo: case DisplayType.Memo:
case DisplayType.String: case DisplayType.String:
case DisplayType.Text: case DisplayType.Text: