[Openutils-svn] SF.net SVN: openutils:[2657] trunk/openutils-mgnlcontrols/src/main/ resources/dialogs/grid.ftl

[<die...@us...>]

Revision: 2657
          http://openutils.svn.sourceforge.net/openutils/?rev=2657&view=rev
Author:   diego_schivo
Date:     2010-06-17 16:29:42 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
CONTROLS-26 grid rows number initialization

Modified Paths:
--------------
    trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl

Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl	2010-06-17 14:56:06 UTC (rev 2656)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl	2010-06-17 16:29:42 UTC (rev 2657)
@@ -86,14 +86,21 @@
   [/#if]
 [/#list]
 
+
 <script type="text/javascript">
     // <![CDATA[
 
 function loadTable${key}(action) {
-  var numOfRows= ${configuration.rows!10};
-
   var hidden = document.getElementById('${name}');
   var rows = hidden.value.split(/\r?\n/);
+  
+  [#assign addRowEnabled = (configuration['addRowEnabled']!false)?string == 'true']
+  [#assign cfgRows = configuration.rows!10]
+  [#if (addRowEnabled)]
+  var numOfRows= Math.max(${cfgRows}, rows.length);
+  [#else]
+  var numOfRows= ${cfgRows};
+  [/#if]
 
   var i, myData = [];
   for (i = 0; i < numOfRows; i++) {
@@ -253,7 +260,7 @@
       handler: function() {
         dataStore.add(new dataStore.recordType({}));
       },
-      disabled: ${((configuration['addRowEnabled']!false)?string == 'false')?string}
+      disabled: ${(!addRowEnabled)?string}
     }],
     viewConfig: {
       forceFit: true


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.