Skip to content

Commit d65fd7e

Browse files
committedSep 7, 2011
Pending perlDreamer's comments...:
Revert "Mobile template is not being inherited (#12246)" This reverts commit a462466.
1 parent a462466 commit d65fd7e

File tree

2 files changed

+1
-25
lines changed

2 files changed

+1
-25
lines changed
 

‎lib/WebGUI/Asset.pm

-2
Original file line numberDiff line numberDiff line change
@@ -2921,8 +2921,6 @@ sub www_add {
29212921
encryptPage => $self->get("encryptPage"),
29222922
styleTemplateId => $self->get("styleTemplateId"),
29232923
printableStyleTemplateId => $self->get("printableStyleTemplateId"),
2924-
mobileStyleTemplateId => $self->get("mobileStyleTemplateId"),
2925-
mobileTemplateId => $self->get("mobileTemplateId"),
29262924
isHidden => $self->get("isHidden"),
29272925
className=>$class,
29282926
assetId=>"new",

‎t/Asset/Wobject/Layout.t

+1-23
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ use lib "$FindBin::Bin/../../lib";
1616
use Test::MockTime qw/:all/; ##Must be loaded before all other code
1717
use WebGUI::Test;
1818
use WebGUI::Session;
19-
use Test::More tests => 5; # increment this value for each test you create
19+
use Test::More tests => 3; # increment this value for each test you create
2020
use WebGUI::Asset::Wobject::Layout;
21-
use WebGUI::Asset::Template;
2221

2322
my $session = WebGUI::Test->session;
2423

@@ -65,25 +64,4 @@ set_relative_time(-100);
6564
$snip1 = $snip1->addRevision({ title => 'titular', }, 18);
6665
is $page->getContentLastModifiedBy, $revised_user1->userId, '... check that a new revision tracks';
6766

68-
# inheriting mobileStyleTemplateId and mobileTemplateId; from ``Mobile template is not being inherited (#12246)''
69-
70-
my $importNode = WebGUI::Asset::Template->getImportNode($session);
71-
my $template1 = $importNode->addChild({className=>"WebGUI::Asset::Template"});
72-
my $template2 = $importNode->addChild({className=>"WebGUI::Asset::Template"});
73-
WebGUI::Test->addToCleanup($template1, $template2);
74-
75-
my $mobileStyleTemplateId = $template1->getId;
76-
my $mobileTemplateId = $template2->getId;
77-
$page->update({ mobileStyleTemplateId => $mobileStyleTemplateId, mobileTemplateId => $mobileTemplateId });
78-
my $url = $page->get('url') . '/layout_child_test';
79-
my $html = WebGUI::Test->getPage($page, "www_add", {
80-
userId => 3,
81-
formParams => {
82-
class => 'WebGUI::Asset::Wobject::Layout',
83-
url => $page->get('url') . '/layout_child_test',
84-
},
85-
});
86-
87-
like $html, qr/name="mobileTemplateId" value="$mobileTemplateId"/, 'child PageLayout inherited parents mobileTempaleId';
88-
like $html, qr/name="mobileStyleTemplateId" value="$mobileStyleTemplateId"/, 'child PageLayout inherited parents mobileStyleTempaleId';
8967

0 commit comments

Comments
 (0)
Please sign in to comment.