[svn:p5ee] r13476 - p5ee/trunk/App-Widget-ExtJS/lib/App/Widget/ExtJS

[spadkins]

Author: spadkins
Date: Thu Nov  5 12:25:55 2009
New Revision: 13476

Modified:
   p5ee/trunk/App-Widget-ExtJS/lib/App/Widget/ExtJS/DataTable.pm

Log:
numcols fix, added hidden cols

Modified: p5ee/trunk/App-Widget-ExtJS/lib/App/Widget/ExtJS/DataTable.pm
==============================================================================
--- p5ee/trunk/App-Widget-ExtJS/lib/App/Widget/ExtJS/DataTable.pm       
(original)
+++ p5ee/trunk/App-Widget-ExtJS/lib/App/Widget/ExtJS/DataTable.pm       Thu Nov 
 5 12:25:55 2009
@@ -620,10 +620,17 @@
     my ($self, $keycolidx, $rowactions, $rowaction, $name) = @_;
 
     my $keycolidx_str = join(",", @$keycolidx);
-    my $rowactions_tbar_js;
+    my ($rowactions_tbar_js, $coma);
     my $single_select = 'false';
+    my $cnt = 0;
 
     foreach my $row_action (@$rowactions) {
+        if ($cnt < $#$rowactions && $cnt != $#$rowactions) {
+            $coma = ",";
+        }
+        else {
+            $coma = ""; 
+        } 
         if ($rowaction->{$row_action}{select} eq "single") {
             $single_select = 'true';
         }
@@ -653,9 +660,9 @@
                         callRowaction(args, '$row_action', '$name');
                     }
                 }
-            }
+            }$coma
 EOF
-
+        $cnt++;
     }
 
     &App::sub_exit($rowactions_tbar_js, $single_select) if ($App::trace);
@@ -883,9 +890,6 @@
     push(@$column_display_defs, $checkbox_name) if ($deleteable || $copyable 
|| $addable || $#$rowactions > -1);
 
     for (my $i = 0; $i <= $#$columns; $i++) {
-        if ($numcols ne "") {
-            last if (($numcols) == $i);
-        }
 
         $column = $columns->[$i];
 
@@ -917,6 +921,12 @@
         $column_display_def->{editor}   = "new Ext.form.${editor}()" if 
($editable);
         #$column_display_def->{filter} = {xtype => "textfield"} if 
($filterable);
 
+        if ($numcols ne "") {
+            if ($i >= $numcols) {
+                $column_display_def->{hidden} = "true";   
+            }
+        }
+
         push(@$column_display_defs, $column_display_def);
         push(@$column_data_defs,    $column_data_def);
         push(@col_types,            {dataIndex => $column, type => $type});