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

Fix title, menuTitle and url around modifiers. Tests for title, menuTitle.

Browse source 
menuTitle is set to be lazy because it depends on title as a default.
This commit is contained in:
Colin Kuskie 2009-12-28 18:36:19 -08:00
parent 49bd7f5032
commit 6733595dfc
2 changed files with 66 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/WebGUI/Asset.pm
View file

@ -35,13 +35,15 @@ property title => (
around title => sub {
my $orig = shift;
my $self = shift;
if (@_ > 1) {
my $title = $_[0];
$title = 'Untitled' if $title eq '';
$title = WebGUI::HTML::filter($title, 'all');
if (@_ > 0) {
my $title = shift;
$title = WebGUI::HTML::filter($title, 'all');
$title = $self->meta->get_attribute('title')->default if $title eq '';
unshift @_, $title;
}
$self->$orig(@_);
};
property menuTitle => (
tab => "properties",
label => ['411','Asset'],
@ -49,17 +51,25 @@ property menuTitle => (
uiLevel => 1,
fieldType => 'text',
defaultValue => 'Untitled',
builder => '_default_menuTitle',
lazy => 1,
);
sub _default_menuTitle {
my $self = shift;
return $self->title;
}
around menuTitle => sub {
my $orig = shift;
my $self = shift;
if (@_ > 1) {
my $title = $_[0];
$title = $self->title if $title eq '';
if (@_ > 0) {
my $title = shift;
$title = WebGUI::HTML::filter($title, 'all');
$title = $self->title if $title eq '';
unshift @_, $title;
}
$self->$orig(@_);
};
property url => (
tab => "properties",
label => ['104','Asset'],
@ -71,7 +81,7 @@ property url => (
around url => sub {
my $orig = shift;
my $self = shift;
if (@_ > 1) {
if (@_ > 0) {
my $url = $_[0];
$url = $self->fixUrl($url);
}