From 79b849262cfbad070416643dd20fc4f0db2244a9 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Wed, 16 Sep 2009 16:07:59 -0700 Subject: [PATCH] WikiPage displays a locked label when locked. fixes bug #10998 --- docs/changelog/7.x.x.txt | 1 + .../packages-7.8.0/default-wiki-page.wgpkg | Bin 2389 -> 2308 bytes lib/WebGUI/Asset/WikiPage.pm | 1 + lib/WebGUI/Help/Asset_WikiPage.pm | 1 + lib/WebGUI/i18n/English/Asset_WikiPage.pm | 5 +++++ t/Asset/WikiPage.t | 16 +++++++++++++++- 6 files changed, 23 insertions(+), 1 deletion(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index a8262b048..cc0db9ba2 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,5 @@ 7.8.0 + - fixed #10998: wiki page locked? - fixed #10982: Survey menu options appearing twice - fixed #10890: Story Manager: pagination broken for keywords - fixed #10856: no paginate in wiki keyword search diff --git a/docs/upgrades/packages-7.8.0/default-wiki-page.wgpkg b/docs/upgrades/packages-7.8.0/default-wiki-page.wgpkg index 7cfe6a49b44fb7ffda9bcd40e2b20aa6f77e1ae7..2d372aee3913864e1747bd2177246e1736c32c82 100644 GIT binary patch literal 2308 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 H04M+e-JYY- diff --git a/lib/WebGUI/Asset/WikiPage.pm b/lib/WebGUI/Asset/WikiPage.pm index b46d335e7..d2e8ef30b 100644 --- a/lib/WebGUI/Asset/WikiPage.pm +++ b/lib/WebGUI/Asset/WikiPage.pm @@ -299,6 +299,7 @@ sub getTemplateVars { allowsAttachments => $wiki->get("allowAttachments"), comments => $self->getFormattedComments(), canEdit => $self->canEdit, + isProtected => $self->isProtected, content => $wiki->autolinkHtml( $self->scrubContent, {skipTitles => [$self->get('title')]}, diff --git a/lib/WebGUI/Help/Asset_WikiPage.pm b/lib/WebGUI/Help/Asset_WikiPage.pm index 36354c338..a9596f8c9 100644 --- a/lib/WebGUI/Help/Asset_WikiPage.pm +++ b/lib/WebGUI/Help/Asset_WikiPage.pm @@ -59,6 +59,7 @@ our $HELP = { { name => 'canEdit', description => 'canEdit variable', }, + { name => 'isProtected', }, { name => 'historyLabel', description => 'historyLabel variable', }, diff --git a/lib/WebGUI/i18n/English/Asset_WikiPage.pm b/lib/WebGUI/i18n/English/Asset_WikiPage.pm index 18e320002..e49d21113 100644 --- a/lib/WebGUI/i18n/English/Asset_WikiPage.pm +++ b/lib/WebGUI/i18n/English/Asset_WikiPage.pm @@ -91,6 +91,11 @@ our $I18N = lastUpdated => 1165790228, }, + 'locked' => { + message => q|Locked|, + lastUpdated => 1253139992, + }, + 'add/edit title' => { message => q|Wiki Page, Add/Edit Template|, lastUpdated => 1165790228, diff --git a/t/Asset/WikiPage.t b/t/Asset/WikiPage.t index 4c54ecd27..f08781a5f 100644 --- a/t/Asset/WikiPage.t +++ b/t/Asset/WikiPage.t @@ -16,7 +16,7 @@ use lib "$FindBin::Bin/../lib"; use WebGUI::Test; use WebGUI::Session; -use Test::More tests => 14; # increment this value for each test you create +use Test::More tests => 18; # increment this value for each test you create use WebGUI::Asset::Wobject::WikiMaster; use WebGUI::Asset::WikiPage; @@ -25,6 +25,7 @@ my $session = WebGUI::Test->session; my $node = WebGUI::Asset->getImportNode($session); my $versionTag = WebGUI::VersionTag->getWorking($session); $versionTag->set({name=>"Wiki Test"}); +WebGUI::Test->tagsToRollback($versionTag); my $wiki = $node->addChild({className=>'WebGUI::Asset::Wobject::WikiMaster'}); $versionTag->commit; @@ -32,6 +33,7 @@ my $wikipage = $wiki->addChild({className=>'WebGUI::Asset::WikiPage'}); # Wikis create and autocommit a version tag when a child is added. Lets get the name so we can roll it back. my $secondVersionTag = WebGUI::VersionTag->new($session,$wikipage->get("tagId")); +WebGUI::Test->tagsToRollback($secondVersionTag ); # Test for sane object types isa_ok($wiki, 'WebGUI::Asset::Wobject::WikiMaster'); @@ -45,7 +47,19 @@ is($article, undef, "Can't add an Article wobject as a child to a Wiki Page."); my $wikiPageCopy = $wikipage->duplicate(); isa_ok($wikiPageCopy, 'WebGUI::Asset::WikiPage'); my $thirdVersionTag = WebGUI::VersionTag->new($session,$wikiPageCopy->get("tagId")); +WebGUI::Test->tagsToRollback($thirdVersionTag); +## isProtected + +$wikiPageCopy->update({isProtected => 1}); +ok($wikiPageCopy->isProtected, 'isProtected: copied page returns true'); +ok(! $wikipage->isProtected, '... original page is not'); + +## wiki page template variables + +ok( ! $wikipage->getTemplateVars->{isProtected}, 'view template variables: isProtected is false on wiki page 1'); + +ok( $wikiPageCopy->getTemplateVars->{isProtected}, '... isProtected is true on wiki page 2'); ################## # This section tests the Comments aspect