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

fix merge problems

Browse source
This commit is contained in:
Doug Bell 2010-07-12 15:52:38 -05:00
parent babfa74209
commit 29b1f794cd
14 changed files with 174 additions and 357 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -249,6 +249,7 @@ property icalFeeds => (
defaultValue => [],
serialize => 1,
tab => "feeds",
label => ['feeds','Asset_Calendar'],
fields => [
{
name => 'feedId',
@ -258,17 +259,17 @@ property icalFeeds => (
name => 'url',
type => 'text',
size => '40',
label => $i18n->get('Feed URL'),
label => ['Feed URL','Asset_Calendar'],
},
{
name => 'status',
type => 'readonly',
label => $i18n->get('434','WebGUI'),
label => ['434','WebGUI'],
},
{
name => 'lastUpdated',
type => 'readonly',
label => $i18n->get('454', 'WebGUI'),
label => ['454', 'WebGUI'],
},
],
);