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

fixed: Thingy: subtext is not displayed

Browse source
This commit is contained in:
Yung Han Khoe 2008-04-05 11:44:32 +00:00
parent 00b939f262
commit 68562cb6ae
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -2,6 +2,7 @@
- fix: Syntax error in GetCsMail
- fixed: Thingy: field types not in alphabetical order
- fixed: Thingy: Text field type listed twice
- fixed: Thingy: subtext is not displayed
7.5.9
- fixed: Collaboration System attachments follow site's max size instead of CS's

15
lib/WebGUI/Asset/Wobject/Thingy.pm
View file

@ -1219,6 +1219,10 @@ sub www_editThing {
else{
$formElement = $self->getFormElement($field);
}
if ($field->{subText}){
$formElement .= '<span class="formSubtext">'.$field->{subText}.'</span>';
}
$fieldsHTML .= "<li class='list1' id='$field->{fieldId}'>"
."\n<table>\n<tr>\n"
." <td style='width:100px;' valign='top' class='formDescription'>".$field->{label}."</td>\n"
@ -1605,6 +1609,10 @@ sub www_editFieldSave {
else{
$formElement = $self->getFormElement(\%properties);
}
if ($properties{subText}){
$formElement .= '<span class="formSubtext">'.$properties{subText}.'</span>';
}
$listItemHTML = "<table>\n<tr>\n<td style='width:100px;' valign='top' class='formDescription'>".$label."</td>\n"
."<td style='width:370px;'>".$formElement."</td>\n"
."<td style='width:120px;' valign='top'> <input onClick=\"editListItem('".$self->session->url->page()
@ -1672,9 +1680,8 @@ sub www_editThingData {
." where thingDataId = ?",[$thingDataId]);
}
$fields = $session->db->read('select * from Thingy_fields where assetId =
'.$session->db->quote($self->get("assetId")).' and thingId = '.$session->db->quote($thingId).' order by
sequenceNumber');
$fields = $session->db->read('select * from Thingy_fields where assetId = ? and thingId = ? order by sequenceNumber'
,[$self->getId,$thingId]);
while (my %field = $fields->hash) {
my $fieldName = 'field_'.$field{fieldId};
if ($session->form->process("func") eq "editThingDataSave"){
@ -1698,7 +1705,7 @@ sequenceNumber');
"isHidden" => $hidden,
"isVisible" => ($field{status} eq "visible" && !$hidden),
"isRequired" => ($field{status} eq "required" && !$hidden),
"subtext" => $field{subtext},
"subtext" => $field{subText},
);
push(@field_loop, { map {("field_".$_ => $fieldProperties{$_})} keys(%fieldProperties) });
}