details: /erp/devel/pi/rev/11e6032e6ef5
changeset: 11983:11e6032e6ef5
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu May 05 11:16:34 2011 +0200
summary: fixed bug 17015: Organization field has been hidden from the Org
access tab
details: /erp/devel/pi/rev/d2c32038b8ef
changeset: 11984:d2c32038b8ef
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu May 05 11:28:28 2011 +0200
summary: related to issu 1657: Show audit in form after issue 16619
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
| 8 +++---
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFormComponent.java
| 12 +++++++++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 3 ++
src-db/database/sourcedata/AD_FIELD.xml
| 5 ++-
4 files changed, 21 insertions(+), 7 deletions(-)
diffs (92 lines):
diff -r d2dcfbca32db -r d2c32038b8ef
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Thu May 05 11:28:24 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Thu May 05 11:28:28 2011 +0200
@@ -64,10 +64,10 @@
firstFocusedField: true,
</#if>
</#if>
- <#if fieldDefinition.type = "OBSectionItem" || fieldDefinition.type =
"OBNoteSectionItem" || fieldDefinition.type = "OBLinkedItemSectionItem" ||
fieldDefinition.type = "OBAttachmentsSectionItem">
- <#if !fieldDefinition.displayed>
- visible: false,
- </#if>
+ <#if fieldDefinition.type = "OBSectionItem" || fieldDefinition.type =
"OBNoteSectionItem" || fieldDefinition.type = "OBLinkedItemSectionItem" ||
fieldDefinition.type = "OBAttachmentsSectionItem" || fieldDefinition.type =
"OBAuditSectionItem">
+ <#if !fieldDefinition.displayed>
+ visible: false,
+ </#if>
sectionExpanded: ${fieldDefinition.expanded?string},
defaultValue: '${fieldDefinition.label?js_string}',
itemIds: [
diff -r d2dcfbca32db -r d2c32038b8ef
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFormComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFormComponent.java
Thu May 05 11:28:24 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFormComponent.java
Thu May 05 11:28:28 2011 +0200
@@ -233,6 +233,7 @@
if (!auditFields.isEmpty()) {
final OBViewFieldGroup viewFieldGroup = new OBViewFieldGroup();
viewFieldGroup.setExpanded(false);
+ viewFieldGroup.setType("OBAuditSectionItem");
fields.add(viewFieldGroup);
viewFieldGroup.setFieldGroup(OBDal.getInstance().get(FieldGroup.class,
AUDIT_GROUP_ID));
viewFieldGroup.addChildren(auditFields);
@@ -735,10 +736,15 @@
public class OBViewFieldGroup extends DefaultVirtualField {
private boolean expanded = true;
+ private String type;
private FieldGroup fieldGroup;
private String label;
private List<OBViewFieldDefinition> children = new
ArrayList<OBViewFieldDefinition>();
+ public OBViewFieldGroup() {
+ type = "OBViewFieldGroup";
+ }
+
public String getLabel() {
// compute the label
if (label == null) {
@@ -772,7 +778,11 @@
}
public String getType() {
- return "OBSectionItem";
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
}
public String getName() {
diff -r d2dcfbca32db -r d2c32038b8ef
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Thu May 05 11:28:24 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Thu May 05 11:28:28 2011 +0200
@@ -486,6 +486,9 @@
}
});
+//== OBAuditSectionItem ==
+isc.ClassFactory.defineClass('OBAuditSectionItem', OBSectionItem);
+
// == OBListItem ==
// Combo box for list references, note is extended by OBFKItem again
isc.ClassFactory.defineClass('OBListItem', ComboBoxItem);
diff -r d2dcfbca32db -r d2c32038b8ef src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Thu May 05 11:28:24 2011 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml Thu May 05 11:28:28 2011 +0200
@@ -52524,14 +52524,15 @@
<!--4394--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
<!--4394--> <AD_TAB_ID><![CDATA[351]]></AD_TAB_ID>
<!--4394--> <AD_COLUMN_ID><![CDATA[5508]]></AD_COLUMN_ID>
-<!--4394--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--4394--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
<!--4394--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
<!--4394--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--4394--> <SEQNO><![CDATA[10]]></SEQNO>
<!--4394--> <SORTNO><![CDATA[1]]></SORTNO>
<!--4394--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
<!--4394--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
<!--4394--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--4394--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--4394--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
<!--4394--> <ISFIRSTFOCUSEDFIELD><![CDATA[Y]]></ISFIRSTFOCUSEDFIELD>
<!--4394--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--4394--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
