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

Merge commit 'b8845e25fa' into WebGUI8. Up to 7.10.0

Browse source
This commit is contained in:
Colin Kuskie 2010-09-22 07:58:06 -07:00
commit 0180b11064
45 changed files with 480 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/WebGUI/Asset/Post.pm
View file

@ -1635,8 +1635,12 @@ sub www_edit {
});
$var{'userDefined'.$x.'.form.htmlarea'}
= WebGUI::Form::HTMLArea($session, {
name => "userDefined".$x,
value => $userDefinedValue,
name => "userDefined".$x,
value => $userDefinedValue,
richEditId => ($self->isa("WebGUI::Asset::Post::Thread")
? $self->getThread->getParent->get("richEditor")
: $self->getThread->getParent->get("replyRichEditor")
),
});
$var{'userDefined'.$x.'.form.float'}
= WebGUI::Form::Float($session, {

2
lib/WebGUI/Asset/Template.pm
View file

@ -294,7 +294,7 @@ override getEditForm => sub {
$tabform->getTab('properties')->addField( "jsonTable",
name => 'attachmentsJson',
value => $self->get('attachmentsJson'),
label => $i18n->get("attachments display label"),
label => $i18n->get("attachment display label"),
fields => [
{
type => "text",

1
lib/WebGUI/Asset/Template/HTMLTemplate.pm
View file

@ -54,6 +54,7 @@ sub process {
my $self = shift;
my $template = shift;
my $vars = $self->addSessionVars(shift);
$self->downgrade($vars);
my $t;
eval {
$t = HTML::Template->new(

1
lib/WebGUI/Asset/Template/HTMLTemplateExpr.pm
View file

@ -81,6 +81,7 @@ sub process {
my $class = shift;
my $template = shift;
my $vars = $class->addSessionVars(shift);
$class->downgrade($vars);
my $t;
eval {
$t = HTML::Template::Expr->new(scalarref=>\$template,

44
lib/WebGUI/Asset/Template/Parser.pm
View file

@ -16,6 +16,7 @@ package WebGUI::Asset::Template::Parser;
use strict;
use WebGUI::International;
use Scalar::Util qw(blessed);
#-------------------------------------------------------------------
@ -63,6 +64,49 @@ sub addSessionVars {
#-------------------------------------------------------------------
=head2 downgrade ( vars )
Removes or converts things HTML::Template-like engines can't handle. Coderefs
are removed, blessed objects are removed, and hashes are recursively flattened
by appending keys separated by dots (e.g. { foo => { bar => 'baz' } } becomes
{ 'foo.bar' => 'baz' }. Also, array elements that aren't hashes are converted
to hashes via { value => $bareValue }.
=cut
sub downgrade {
my ($self, $vars) = @_;
for my $k (keys %$vars) {
my $v = $vars->{$k};
if (blessed($v) || ref $v eq 'CODE') {
delete $vars->{$k};
}
elsif (ref $v eq 'ARRAY') {
for my $i (0..$#$v) {
if (ref $v->[$i] eq 'HASH') {
$self->downgrade($v->[$i]);
}
else {
my %hash = ( value => $v->[$i] );
$self->downgrade(\%hash);
$v->[$i] = \%hash;
}
}
}
elsif (ref $v eq 'HASH') {
delete $vars->{$k};
my %flatter;
for my $subkey (keys %$v) {
$flatter{"$k.$subkey"} = $v->{$subkey};
}
$self->downgrade(\%flatter);
@{$vars}{keys %flatter} = values %flatter;
}
}
}
#-------------------------------------------------------------------
=head2 new ( session )
Constructor.

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

@ -133,8 +133,8 @@ sub generateFeed {
my $cache = $session->cache;
my $sort = $self->sortItems;
my %opt = (use_ixhash => 1) if $sort eq 'feed';
my $feed = XML::FeedPP::Atom->new(%opt);
my @opt = (use_ixhash => 1) if $sort eq 'feed';
my $feed = XML::FeedPP::Atom->new(@opt);
# build one feed out of many
my $newlyCached = 0;
@ -163,7 +163,7 @@ sub generateFeed {
}, $self->cacheTimeout );
eval {
my $singleFeed = XML::FeedPP->new($value, utf8_flag => 1, -type => 'string', xml_deref => 1, %opt);
my $singleFeed = XML::FeedPP->new($value, utf8_flag => 1, -type => 'string', xml_deref => 1, @opt);
$feed->merge_channel($singleFeed);
$feed->merge_item($singleFeed);
};