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

Fix the display of the lastUpdated and lastResult fields for Calendar iCal feeds. Fix the name of the status field in the Asset definition. Update all revisions of all calendars to fix the issue. Fixes bug #12104.

Browse source
This commit is contained in:
Colin Kuskie 2011-04-18 16:26:57 -07:00
parent 9065aa9eb8
commit e5d94f3a5b
4 changed files with 46 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/WebGUI/Asset/Wobject/Calendar.pm
View file

@ -274,7 +274,7 @@ sub definition {
label => $i18n->get('Feed URL'),
},
{
name => 'status',
name => 'lastResult',
type => 'readonly',
label => $i18n->get('434','WebGUI'),
},
@ -869,6 +869,17 @@ sub processPropertiesFromFormPost {
$self->createSubscriptionGroup();
}
my @feeds = @{ $self->getFeeds };
foreach my $feed (@feeds) {
if ($feed->{lastUpdated} eq 'new') {
$feed->{lastUpdated} = 'never';
}
if ($feed->{lastResult} eq 'new') {
$feed->{lastResult} = '';
}
$self->setFeed($feed->{feedId}, $feed);
}
return;
}

5
lib/WebGUI/Form/JsonTable.pm
View file

@ -203,7 +203,10 @@ sub toHtml {
elsif ( $field->{type} eq "id" ) {
$fieldHtml .= '<input type="hidden" class="jsontable_id" name="' . $fieldName . '" value="new" />';
}
else { # Readonly or unknown
elsif ( $field->{type} eq "hidden" || $field->{type} eq "readonly" ) {
$fieldHtml .= '<input type="hidden" name="' . $fieldName . '" value="new" />';
}
else { # Unknown
$fieldHtml = '&nbsp;';
}