details:   /erp/devel/pi/rev/ddff30bdc259
changeset: 9320:ddff30bdc259
user:      Iván Perdomo <ivan.perdomo <at> openbravo.com>
date:      Thu Dec 23 11:23:10 2010 +0100
summary:   [fl] Added support for field groups

diffstat:

 
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
  |  9 +++++++++
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFormComponent.java
 |  4 ++--
 
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
       |  4 ++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diffs (54 lines):

diff -r 1c94ebed6ca1 -r ddff30bdc259 
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 Dec 23 10:54:19 2010 +0100
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
      Thu Dec 23 11:23:10 2010 +0100
@@ -32,6 +32,15 @@
         startRow: ${fieldDefinition.startRow},
         endRow: ${fieldDefinition.endRow},
         width: '*',
+        <#else>
+        type: 'OBSectionItem',
+        sectionExpanded: true,
+        defaultValue: '${fieldDefinition.label?js_string}',
+        itemIds: [
+        <#list fieldDefinition.children as childField>
+        '${childField.name?js_string}'<#if childField_has_next>,</#if>
+        </#list>
+        ],
         </#if>
         ${fieldDefinition.fieldProperties}
         dummy: "dummy"
diff -r 1c94ebed6ca1 -r ddff30bdc259 
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 Dec 23 10:54:19 2010 +0100
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFormComponent.java
     Thu Dec 23 11:23:10 2010 +0100
@@ -329,7 +329,7 @@
     }
 
     public String getEndRow() {
-      return "false";
+      return "true";
     }
 
     public long getRowSpan() {
@@ -337,7 +337,7 @@
     }
 
     public String getStartRow() {
-      return "false";
+      return "true";
     }
   }
 
diff -r 1c94ebed6ca1 -r ddff30bdc259 
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 Dec 23 10:54:19 2010 +0100
+++ 
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
   Thu Dec 23 11:23:10 2010 +0100
@@ -52,6 +52,10 @@
 // Input for large strings
 isc.ClassFactory.defineClass('OBTextAreaItem', TextAreaItem);
 
+// == OBTextAreaItem ==
+// Form sections
+isc.ClassFactory.defineClass('OBSectionItem', SectionItem);
+
 // == OBListComboBoxItem ==
 // Combo box for list references
 isc.ClassFactory.defineClass('OBListComboBoxItem', ComboBoxItem);

------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and, 
should the need arise, upgrade to a full multi-node Oracle RAC database 
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to