details: /erp/devel/pi/rev/11d1a85b926b
changeset: 10299:11d1a85b926b
user: Asier Galdos <asier.galdos <at> almis.com>
date: Tue Feb 01 18:59:34 2011 +0100
summary: Fixes issue 0015668. Amend the OBWidget layout.
details: /erp/devel/pi/rev/ba5333c42a6b
changeset: 10300:ba5333c42a6b
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Feb 02 10:20:13 2011 +0100
summary: Merge changes from pi-agaldos branch
diffstat:
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
| 6 ++++
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
| 13 +++------
src-db/database/model/tables/AD_CREATEFACT_TEMPLATE.xml
| 2 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 2 +-
4 files changed, 12 insertions(+), 11 deletions(-)
diffs (90 lines):
diff -r cd2222d2b80b -r ba5333c42a6b
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
Tue Feb 01 17:19:07 2011 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
Wed Feb 02 10:20:13 2011 +0100
@@ -77,6 +77,8 @@
private static final String PARAMETERNAME = "name";
private static final String PARAMETERTITLE = "title";
private static final String PARAMETERTYPE = "type";
+ private static final String PARAMETERWIDTH = "width";
+ private static final String PARAMETERCOLSPAN = "colSpan";
private static final String PARAMETERFIELDPROPERTIES = "fieldProperties";
private static final String PARAMETERREQUIRED = "required";
private static final String DBINSTANCEID = "dbInstanceId";
@@ -124,6 +126,7 @@
fieldDefinition.put(PARAMETERID, parameter.getId());
fieldDefinition.put(PARAMETERNAME, parameter.getDBColumnName());
fieldDefinition.put(PARAMETERREQUIRED, parameter.isMandatory());
+ fieldDefinition.put(PARAMETERWIDTH, "*");
final Reference reference;
if (parameter.getReferenceSearchKey() != null) {
@@ -131,6 +134,9 @@
} else {
reference = parameter.getReference();
}
+ if (reference.getName().equals("Text") ||
reference.getName().equals("Memo"))
+ fieldDefinition.put(PARAMETERCOLSPAN, 2);
+
final UIDefinition uiDefinition =
UIDefinitionController.getInstance().getUIDefinition(
reference);
fieldDefinition.put(PARAMETERTYPE, uiDefinition.getName());
diff -r cd2222d2b80b -r ba5333c42a6b
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
---
a/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
Tue Feb 01 17:19:07 2011 +0100
+++
b/modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js
Wed Feb 02 10:20:13 2011 +0100
@@ -290,7 +290,10 @@
height: '100%',
titleSuffix: '',
requiredTitleSuffix: '',
- autoFocus: true
+ autoFocus: true,
+ titleOrientation: 'top',
+ numCols: 2,
+ colWidths: ['*','*']
});
// set the initial values
@@ -307,20 +310,12 @@
}
var formItem = isc.addProperties({
- titleOrientation: 'top'
}, fieldDefinition);
items.push(formItem);
}
theForm.setItems(items);
- formLayout.addMember(isc.Label.create({
- contents: OB.I18N.getLabel('OBKMO_EditParameters'),
- className: 'OBMyOBEditParametersLabel',
- height: 1,
- width: '100%',
- overflow: 'visible'
- }));
formLayout.addMember(theForm);
formLayout.editForm = theForm;
diff -r cd2222d2b80b -r ba5333c42a6b
src-db/database/model/tables/AD_CREATEFACT_TEMPLATE.xml
--- a/src-db/database/model/tables/AD_CREATEFACT_TEMPLATE.xml Tue Feb 01
17:19:07 2011 +0100
+++ b/src-db/database/model/tables/AD_CREATEFACT_TEMPLATE.xml Wed Feb 02
10:20:13 2011 +0100
@@ -37,7 +37,7 @@
<default/>
<onCreateDefault/>
</column>
- <column name="CLASSNAME" primaryKey="false" required="true"
type="NVARCHAR" size="60" autoIncrement="false">
+ <column name="CLASSNAME" primaryKey="false" required="true"
type="NVARCHAR" size="1000" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
diff -r cd2222d2b80b -r ba5333c42a6b src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Feb 01 17:19:07 2011 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Feb 02 10:20:13 2011 +0100
@@ -264354,7 +264354,7 @@
<!--173E1D341EC411DE9815138D2760737D-->
<COLUMNNAME><![CDATA[Classname]]></COLUMNNAME>
<!--173E1D341EC411DE9815138D2760737D-->
<AD_TABLE_ID><![CDATA[359738C46111461EA0CA2A13E5709519]]></AD_TABLE_ID>
<!--173E1D341EC411DE9815138D2760737D-->
<AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--173E1D341EC411DE9815138D2760737D-->
<FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--173E1D341EC411DE9815138D2760737D-->
<FIELDLENGTH><![CDATA[1000]]></FIELDLENGTH>
<!--173E1D341EC411DE9815138D2760737D--> <ISKEY><![CDATA[N]]></ISKEY>
<!--173E1D341EC411DE9815138D2760737D--> <ISPARENT><![CDATA[N]]></ISPARENT>
<!--173E1D341EC411DE9815138D2760737D-->
<ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
