diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 665e6ef27..60e54aab5 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,6 +1,7 @@ 7.5.20 - fixed: The indent loop of the Navigation wobject has an incorrect number of iterations in some cases. (Martin Kamerbeek / Oqapi) + - fixed: Thingy: Setting the size of a field has no effect 7.5.19 - fixed: paginator doesn't show correct number of page links with a limit applied diff --git a/docs/upgrades/upgrade_7.5.19-7.5.20.pl b/docs/upgrades/upgrade_7.5.19-7.5.20.pl index 162474883..54696748f 100644 --- a/docs/upgrades/upgrade_7.5.19-7.5.20.pl +++ b/docs/upgrades/upgrade_7.5.19-7.5.20.pl @@ -29,6 +29,7 @@ my $quiet; # this line required my $session = start(); # this line required # upgrade functions go here +addThingyFieldsSizeColumn( $session ); finish($session); # this line required @@ -42,6 +43,17 @@ finish($session); # this line required # print "DONE!\n" unless $quiet; #} +#---------------------------------------------------------------------------- +# Add Thingy_fields size column +sub addThingyFieldsSizeColumn { + my $session = shift; + print "\tAdding Thingy_fields size column... " unless $quiet; + + $session->db->write( + "alter table Thingy_fields add size int(11)" + ); + print "Done!\n" unless $quiet; +} # -------------- DO NOT EDIT BELOW THIS LINE -------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm index 216e86b07..14ef37ddb 100644 --- a/lib/WebGUI/Asset/Wobject/Thingy.pm +++ b/lib/WebGUI/Asset/Wobject/Thingy.pm @@ -1327,7 +1327,7 @@ sub www_editThing { $formElement = $self->getFormElement($field); } if ($field->{subtext}){ - $formElement .= ''.$field->{subtext}.''; + $formElement .= '
'.$field->{subtext}.''; } $fieldsHTML .= "
  • " @@ -1690,6 +1690,7 @@ sub www_editFieldSave { possibleValues=>$self->session->form->process("possibleValues"), subtext=>$self->session->form->process("subtext"), status=>$self->session->form->process("status"), + size=>$self->session->form->process("size"), width=>$self->session->form->process("width"), height=>$self->session->form->process("height"), vertical=>$self->session->form->process("vertical"),