From a36750fde39b3e406dff1269d1b0be69b2de48ef Mon Sep 17 00:00:00 2001 From: Patrick Donelan Date: Wed, 11 Mar 2009 18:57:21 +1100 Subject: [PATCH] Removed DataTable edits from this topic branch --- lib/WebGUI/Asset/Wobject/DataTable.pm | 1 - lib/WebGUI/Form/DataTable.pm | 7 +++-- lib/WebGUI/HTMLForm.pm | 3 +-- lib/WebGUI/i18n/English/Form_DataTable.pm | 7 ----- www/extras/yui-webgui/build/form/datatable.js | 26 +++++-------------- 5 files changed, 10 insertions(+), 34 deletions(-) diff --git a/lib/WebGUI/Asset/Wobject/DataTable.pm b/lib/WebGUI/Asset/Wobject/DataTable.pm index da18f460a..e8f25fd93 100644 --- a/lib/WebGUI/Asset/Wobject/DataTable.pm +++ b/lib/WebGUI/Asset/Wobject/DataTable.pm @@ -125,7 +125,6 @@ sub getDataTemplateVars { my $self = shift; my $json = $self->getDataJson; - $self->session->log->warn($json); my $dt = JSON->new->decode($json); # Make row data more friendly to templates diff --git a/lib/WebGUI/Form/DataTable.pm b/lib/WebGUI/Form/DataTable.pm index a43a549c9..3ebe5678a 100644 --- a/lib/WebGUI/Form/DataTable.pm +++ b/lib/WebGUI/Form/DataTable.pm @@ -122,11 +122,11 @@ sub getDataTableHtml { # Not using a datastructure and JSON.pm because of function references for "parser" my $columnDef = '{' - . qq["key" : "$column->{ key }", ] - . qq["abbr" : "$column->{ key }", ] + . qq["key" : "$column->{ key }", ] + . qq["abbr" : "$column->{ key }", ] . qq["formatter" : "$column->{ formatter }", ] . qq["resizable" : 1, ] - . qq["sortable" : $column->{sortable} ]; + . qq["sortable" : 1]; # Automatically determine the parser to use if ( $parsers{ $column->{formatter} } ) { @@ -186,7 +186,6 @@ sub getDefaultValue { columns => [ { key => "New Column", formatter => "text", - sortable => "true", }, ], rows => [ { "New Column" => "Value", }, ], diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm index 47decd4eb..683f21e83 100644 --- a/lib/WebGUI/HTMLForm.pm +++ b/lib/WebGUI/HTMLForm.pm @@ -155,7 +155,6 @@ a C method to provide that information. sub dynamicForm { my ($self, $formDefinition, $fieldList, $parent) = @_; - my $form = $self->session->form; foreach my $definition (reverse @{$formDefinition}) { my $properties = $definition->{$fieldList}; foreach my $fieldname (keys %{$properties}) { @@ -166,7 +165,7 @@ sub dynamicForm { $params{$key} = $formDefinition->[0]{name}; } } - $params{value} = $form->get($fieldname) || $parent->get($fieldname); + $params{value} = $parent->get($fieldname); $params{name} = $fieldname; $self->dynamicField(%params); } diff --git a/lib/WebGUI/i18n/English/Form_DataTable.pm b/lib/WebGUI/i18n/English/Form_DataTable.pm index 26e80a527..ad51bad68 100644 --- a/lib/WebGUI/i18n/English/Form_DataTable.pm +++ b/lib/WebGUI/i18n/English/Form_DataTable.pm @@ -139,13 +139,6 @@ our $I18N = { lastUpdated => 0, context => q{Button to delete a column, shown in the Edit Schema dialog}, }, - - "sortable" => { - message => q{sortable}, - lastUpdated => 0, - context => q{Whether a column is sortable in the table}, - }, - }; 1; diff --git a/www/extras/yui-webgui/build/form/datatable.js b/www/extras/yui-webgui/build/form/datatable.js index a96db2181..cedbf8ae9 100644 --- a/www/extras/yui-webgui/build/form/datatable.js +++ b/www/extras/yui-webgui/build/form/datatable.js @@ -338,8 +338,7 @@ WebGUI.Form.DataTable "help select row", "help add row", "help default sort", - "help reorder column", - "sortable" + "help reorder column" ] }, onpreload : { @@ -400,8 +399,7 @@ WebGUI.Form.DataTable div.parentNode.removeChild( div ); }; - var sortableLabel = this.i18n.get( "Form_DataTable", "sortable" ); - var buttonLabel = this.i18n.get( "Form_DataTable", "delete column" ); + var buttonLabel = this.i18n.get( "Form_DataTable", "delete column" ); var availableFormats = [ { "value" : "text", @@ -466,16 +464,6 @@ WebGUI.Form.DataTable format.appendChild( opt ); } div.appendChild( format ); - - div.appendChild( document.createTextNode(sortableLabel) ); - - var sorter = document.createElement( "input" ); - sorter.type = "checkbox"; - sorter.name = "canSort_" + i; - sorter.checked = cols[i].sortable; - sorter.value = 1; - div.appendChild( sorter ); - return div; }; @@ -487,7 +475,6 @@ WebGUI.Form.DataTable var newIdx = cols.length; // create a new column object cols[newIdx] = new YAHOO.widget.Column; - cols[newIdx].sortable = true; // add it to the dialog box this.appendChild( createTableColumn(newIdx,cols) ); }; @@ -613,10 +600,9 @@ WebGUI.Form.DataTable // Update columns var i = 0; while ( data[ "newKey_" + i ] ) { - var oldKey = data[ "oldKey_" + i ]; - var newKey = data[ "newKey_" + i ]; - var format = data[ "format_" + i ][0]; - var canSort = data[ "canSort_" + i ] + var oldKey = data[ "oldKey_" + i ]; + var newKey = data[ "newKey_" + i ]; + var format = data[ "format_" + i ][0]; var col = this.dataTable.getColumn( oldKey ); // Don't allow adding multiple columns with same key @@ -640,7 +626,7 @@ WebGUI.Form.DataTable key : newKey, formatter : format, resizeable : ( col ? col.resizeable : 1 ), - sortable : canSort + sortable : ( col ? col.sortable : 1 ) }; var newIndex = col ? col.getKeyIndex() : undefined;