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

Merge branch 'master' of git@github.com:plainblack/webgui

Browse source 
Conflicts:

	docs/upgrades/upgrade_7.8.0-7.8.1.pl
This commit is contained in:
daviddelikat 2009-10-01 06:01:48 -05:00
commit 5f3477be4a
17 changed files with 347 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Asset/File/Image.pm
View file

@ -654,8 +654,8 @@ sub www_resize {
var resize = new YAHOO.util.Resize('yui_img', {
handles: 'all',
knobHandles: true,
height: '${x}px',
width: '${y}px',
height: '${y}px',
width: '${x}px',
proxy: true,
ghost: true,
status: true,

18
lib/WebGUI/Asset/Sku/Product.pm
View file

@ -153,37 +153,43 @@ sub definition {
##Collateral data is stored as JSON in here
autoGenerate => 0,
defaultValue => '[]',
fieldType=>"textarea",
fieldType => "textarea",
noFormPost => 1,
},
accessoryJSON => {
##Collateral data is stored as JSON in here
autoGenerate => 0,
defaultValue => '[]',
fieldType=>"textarea",
fieldType => "textarea",
noFormPost => 1,
},
relatedJSON => {
##Collateral data is stored as JSON in here
autoGenerate => 0,
defaultValue => '[]',
fieldType=>"textarea",
fieldType => "textarea",
noFormPost => 1,
},
specificationJSON => {
##Collateral data is stored as JSON in here
autoGenerate => 0,
defaultValue => '[]',
fieldType=>"textarea",
fieldType => "textarea",
noFormPost => 1,
},
featureJSON => {
##Collateral data is stored as JSON in here
autoGenerate => 0,
defaultValue => '[]',
fieldType=>"textarea",
fieldType => "textarea",
noFormPost => 1,
},
benefitJSON => {
##Collateral data is stored as JSON in here
autoGenerate => 0,
defaultValue => '[]',
fieldType=>"textarea",
fieldType => "textarea",
noFormPost => 1,
},
);
push(@{$definition}, {

1
lib/WebGUI/Asset/Story.pm
View file

@ -166,6 +166,7 @@ sub definition {
fieldType => 'textarea',
defaultValue => '[]',
noFormPost => 1,
autoGenerate => 0,
},
);
push(@{$definition}, {

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

@ -892,10 +892,10 @@ sub getFieldValue {
my $processedValue = $value;
my $dbh = $self->session->db->dbh;
if ($field->{fieldType} eq "date"){
if (lc $field->{fieldType} eq "date"){
$processedValue = $self->session->datetime->epochToHuman($value,$dateFormat);
}
elsif ($field->{fieldType} eq "dateTime"){
elsif (lc $field->{fieldType} eq "datetime"){
$processedValue = $self->session->datetime->epochToHuman($value,$dateTimeFormat);
}
# TODO: The otherThing field type is probably also handled by getFormPlugin, so the elsif below can probably be