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

Merge branch 'master' into 8-merge

Browse source 
Conflicts:
	docs/gotcha.txt
	docs/upgrades/upgrade_7.9.8-7.9.9.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Carousel.pm
	t/Asset/Asset.t
	t/Mail/Send.t
	t/Session/Url.t
	t/lib/WebGUI/Test.pm
This commit is contained in:
Doug Bell 2010-07-14 17:06:19 -05:00
commit cd1e450c32
1229 changed files with 499 additions and 313891 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -241,13 +241,11 @@ sub _listViewPageInterval_builder {
}
property icalFeeds => (
fieldType => "JsonTable",
default => sub { return []; },
traits => ['Array', 'WebGUI::Definition::Meta::Property::Serialize',],
isa => 'WebGUI::Type::JSONArray',
coerce => 1,
fieldType => "JsonTable",
defaultValue => [],
serialize => 1,
traits => ['Array', 'WebGUI::Definition::Meta::Property::Serialize',],
tab => "feeds",
label => ['feeds','Asset_Calendar'],
fields => [

8
lib/WebGUI/Asset/Wobject/Carousel.pm
View file

@ -15,6 +15,7 @@ $VERSION = "1.0.0";
use strict;
use JSON;
use WebGUI::International;
use WebGUI::Utility;
use Moose;
use WebGUI::Definition::Asset;
extends 'WebGUI::Asset::Wobject';
@ -37,6 +38,13 @@ property slideWidth => (
hoverHelp => [ 'carousel slideWidth description', 'Asset_Carousel' ],
label => [ 'carousel slideWidth label', 'Asset_Carousel' ],
);
property slideHeight => (
fieldType => "integer",
default => 0,
tab => "display",
hoverHelp => ['carousel slideHeight description', 'Asset_Carousel' ],
label => ['carousel slideHeight label', 'Asset_Carousel' ],
);
property items => (
noFormPost => 1,
fieldType => 'text',

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

@ -2843,7 +2843,7 @@ sub www_import {
my $fieldType = $insertColumn->{fieldType};
my $fieldInOtherThingId = $insertColumn->{fieldInOtherThingId};
# TODO: process dates and otherThing field id's
if ($fieldType eq "date" || $fieldType eq "dateTime"){
if (lc $fieldType eq "date" || lc $fieldType eq "datetime"){
$fieldValue =~ s/\//-/gx;
$fieldValue = $session->datetime->setToEpoch($fieldValue);
}