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

Merge branch 'master' into WebGUI8

Browse source
This commit is contained in:
Graham Knop 2010-04-13 07:50:02 -05:00
commit 2400f19099
797 changed files with 33894 additions and 27196 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,7 +102,7 @@ sub getDataTemplateVars {
my $self = shift;
my $json = $self->getDataJson;
my $dt = JSON->new->decode($json);
my $dt = eval { JSON->new->decode($json) };
# Make row data more friendly to templates
my %cols = map { $_->{key} => $_ } @{ $dt->{columns} };
@ -131,7 +131,8 @@ override getEditForm => sub {
my $tabform = super();
$tabform->getTab("data")->raw(
WebGUI::Form::DataTable->new(
q{<tr><td>}
. WebGUI::Form::DataTable->new(
$self->session, {
name => "data",
value => $self->data,
@ -139,6 +140,7 @@ override getEditForm => sub {
showEdit => 1,
}
)->toHtml
. q{</td></tr>}
);
return $tabform;