oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed DataTable edits from this topic branch

Browse source
This commit is contained in:
Patrick Donelan 2009-03-11 18:57:21 +11:00
parent 634706efc1
commit a36750fde3
5 changed files with 10 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/WebGUI/Asset/Wobject/DataTable.pm
View file

@ -125,7 +125,6 @@ sub getDataTemplateVars {
my $self = shift; my $self = shift;
my $json = $self->getDataJson; my $json = $self->getDataJson;
$self->session->log->warn($json);
my $dt = JSON->new->decode($json); my $dt = JSON->new->decode($json);
# Make row data more friendly to templates # Make row data more friendly to templates

7
lib/WebGUI/Form/DataTable.pm
View file

@ -122,11 +122,11 @@ sub getDataTableHtml {
# Not using a datastructure and JSON.pm because of function references for "parser" # Not using a datastructure and JSON.pm because of function references for "parser"
my $columnDef my $columnDef
= '{' = '{'
. qq["key" : "$column->{ key }", ] . qq["key" : "$column->{ key }", ]
. qq["abbr" : "$column->{ key }", ] . qq["abbr" : "$column->{ key }", ]
. qq["formatter" : "$column->{ formatter }", ] . qq["formatter" : "$column->{ formatter }", ]
. qq["resizable" : 1, ] . qq["resizable" : 1, ]
. qq["sortable" : $column->{sortable} ]; . qq["sortable" : 1];
# Automatically determine the parser to use # Automatically determine the parser to use
if ( $parsers{ $column->{formatter} } ) { if ( $parsers{ $column->{formatter} } ) {
@ -186,7 +186,6 @@ sub getDefaultValue {
columns => [ { columns => [ {
key => "New Column", key => "New Column",
formatter => "text", formatter => "text",
sortable => "true",
}, },
], ],
rows => [ { "New Column" => "Value", }, ], rows => [ { "New Column" => "Value", }, ],

3
lib/WebGUI/HTMLForm.pm
View file

@ -155,7 +155,6 @@ a C<get> method to provide that information.
sub dynamicForm { sub dynamicForm {
my ($self, $formDefinition, $fieldList, $parent) = @_; my ($self, $formDefinition, $fieldList, $parent) = @_;
my $form = $self->session->form;
foreach my $definition (reverse @{$formDefinition}) { foreach my $definition (reverse @{$formDefinition}) {
my $properties = $definition->{$fieldList}; my $properties = $definition->{$fieldList};
foreach my $fieldname (keys %{$properties}) { foreach my $fieldname (keys %{$properties}) {
@ -166,7 +165,7 @@ sub dynamicForm {
$params{$key} = $formDefinition->[0]{name}; $params{$key} = $formDefinition->[0]{name};
} }
} }
$params{value} = $form->get($fieldname) || $parent->get($fieldname); $params{value} = $parent->get($fieldname);
$params{name} = $fieldname; $params{name} = $fieldname;
$self->dynamicField(%params); $self->dynamicField(%params);
} }

7
lib/WebGUI/i18n/English/Form_DataTable.pm
View file

@ -139,13 +139,6 @@ our $I18N = {
lastUpdated => 0, lastUpdated => 0,
context => q{Button to delete a column, shown in the Edit Schema dialog}, 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; 1;

26
www/extras/yui-webgui/build/form/datatable.js vendored
View file

@ -338,8 +338,7 @@ WebGUI.Form.DataTable
"help select row", "help select row",
"help add row", "help add row",
"help default sort", "help default sort",
"help reorder column", "help reorder column"
"sortable"
] ]
}, },
onpreload : { onpreload : {
@ -400,8 +399,7 @@ WebGUI.Form.DataTable
div.parentNode.removeChild( div ); 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 = [ var availableFormats = [
{ {
"value" : "text", "value" : "text",
@ -466,16 +464,6 @@ WebGUI.Form.DataTable
format.appendChild( opt ); format.appendChild( opt );
} }
div.appendChild( format ); 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; return div;
}; };
@ -487,7 +475,6 @@ WebGUI.Form.DataTable
var newIdx = cols.length; var newIdx = cols.length;
// create a new column object // create a new column object
cols[newIdx] = new YAHOO.widget.Column; cols[newIdx] = new YAHOO.widget.Column;
cols[newIdx].sortable = true;
// add it to the dialog box // add it to the dialog box
this.appendChild( createTableColumn(newIdx,cols) ); this.appendChild( createTableColumn(newIdx,cols) );
}; };
@ -613,10 +600,9 @@ WebGUI.Form.DataTable
// Update columns // Update columns
var i = 0; var i = 0;
while ( data[ "newKey_" + i ] ) { while ( data[ "newKey_" + i ] ) {
var oldKey = data[ "oldKey_" + i ]; var oldKey = data[ "oldKey_" + i ];
var newKey = data[ "newKey_" + i ]; var newKey = data[ "newKey_" + i ];
var format = data[ "format_" + i ][0]; var format = data[ "format_" + i ][0];
var canSort = data[ "canSort_" + i ]
var col = this.dataTable.getColumn( oldKey ); var col = this.dataTable.getColumn( oldKey );
// Don't allow adding multiple columns with same key // Don't allow adding multiple columns with same key
@ -640,7 +626,7 @@ WebGUI.Form.DataTable
key : newKey, key : newKey,
formatter : format, formatter : format,
resizeable : ( col ? col.resizeable : 1 ), resizeable : ( col ? col.resizeable : 1 ),
sortable : canSort sortable : ( col ? col.sortable : 1 )
}; };
var newIndex = col ? col.getKeyIndex() : undefined; var newIndex = col ? col.getKeyIndex() : undefined;