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

Revert "Mobile template is not being inherited (#12246)"

Browse source 
... per perlDreamer's additional argument for his original design for this

This reverts commit 2628263384.
This commit is contained in:
Scott Walters 2011-09-07 18:46:18 -04:00
parent 0871ceb56a
commit b05c7ea810
4 changed files with 1 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -7,7 +7,6 @@
- fixed #12239: Still get cart error message after removing extra recurring items from the cart
- fixed #12240: Empty Extend Calendar Recurrance version tags
- fixed #12241: Account Shop
- fixed #12246: added extra_www_add_properties as properties fix-up hook in child for www_add
7.10.22
- rfe #12223: Add date type to content profiling (metadata)

19
lib/WebGUI/Asset.pm
View file

@ -2927,7 +2927,6 @@ sub www_add {
url=>scalar($self->session->form->param("url")),
);
$properties{isHidden} = 1 unless $self->session->config->get("assets/".$class."/isContainer");
$class->extra_www_add_properties($self->session, $self, \%properties );
my $newAsset = WebGUI::Asset->newByPropertyHashRef($self->session,\%properties);
$newAsset->{_parent} = $self;
return $newAsset->www_edit();
@ -2935,24 +2934,6 @@ sub www_add {
#-------------------------------------------------------------------
=head2 extra_www_add_properties ( $session, $parentAsset, \%properties )
Called from C<www_add> by the parent asset on the class of the new asset being constructed.
The asset class has the chance to modify or augment C<$properties> before the new asset
is presented for edit.
This base version does nothing. It should be overridden as needed.
=cut
sub extra_www_add_properties {
my $self = shift;
my $session = shift;
my $parentAsset = shift;
my $properties = shift;
}
#-------------------------------------------------------------------
=head2 www_ajaxInlineView ( )
Returns the view() method of the asset object if the requestor canView.

19
lib/WebGUI/Asset/Wobject/Layout.pm
View file

@ -514,24 +514,5 @@ sub www_view {
return $self->SUPER::www_view;
}
#-------------------------------------------------------------------
=head2 extra_www_add_properties ()
Inherit C<mobileStyleTemplateId> and C<mobileTemplateId> from the parent asset if it is an instance of
L<WebGUI::Asset::Wobject::Layout>.
=cut
sub extra_www_add_properties {
my $self = shift;
my $session = shift;
my $parentAsset = shift;
my $properties = shift;
return unless $parentAsset->isa('WebGUI::Asset::Wobject::Layout');
$properties->{ mobileStyleTemplateId } = $parentAsset->get("mobileStyleTemplateId");
$properties->{ mobileTemplateId } = $parentAsset->get("mobileTemplateId");
}
1;

24
t/Asset/Wobject/Layout.t
View file

@ -16,9 +16,8 @@ use lib "$FindBin::Bin/../../lib";
use Test::MockTime qw/:all/; ##Must be loaded before all other code
use WebGUI::Test;
use WebGUI::Session;
use Test::More tests => 5; # increment this value for each test you create
use Test::More tests => 3; # increment this value for each test you create
use WebGUI::Asset::Wobject::Layout;
use WebGUI::Asset::Template;
my $session = WebGUI::Test->session;
@ -65,25 +64,4 @@ set_relative_time(-100);
$snip1 = $snip1->addRevision({ title => 'titular', }, 18);
is $page->getContentLastModifiedBy, $revised_user1->userId, '... check that a new revision tracks';
# inheriting mobileStyleTemplateId and mobileTemplateId; from ``Mobile template is not being inherited (#12246)''
my $importNode = WebGUI::Asset::Template->getImportNode($session);
my $template1 = $importNode->addChild({className=>"WebGUI::Asset::Template"});
my $template2 = $importNode->addChild({className=>"WebGUI::Asset::Template"});
WebGUI::Test->addToCleanup($template1, $template2);
my $mobileStyleTemplateId = $template1->getId;
my $mobileTemplateId = $template2->getId;
$page->update({ mobileStyleTemplateId => $mobileStyleTemplateId, mobileTemplateId => $mobileTemplateId });
my $url = $page->get('url') . '/layout_child_test';
my $html = WebGUI::Test->getPage($page, "www_add", {
userId => 3,
formParams => {
class => 'WebGUI::Asset::Wobject::Layout',
url => $page->get('url') . '/layout_child_test',
},
});
like $html, qr/name="mobileTemplateId" value="$mobileTemplateId"/, 'child PageLayout inherited parents mobileTempaleId';
like $html, qr/name="mobileStyleTemplateId" value="$mobileStyleTemplateId"/, 'child PageLayout inherited parents mobileStyleTempaleId';