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

Merge commit 'v7.10.15' into 8

Browse source 
Conflicts:
	docs/gotcha.txt
	docs/previousVersion.sql
	docs/templates.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/Event.pm
	lib/WebGUI/Asset/File.pm
	lib/WebGUI/Asset/MapPoint.pm
	lib/WebGUI/Asset/RichEdit.pm
	lib/WebGUI/Asset/Sku/Product.pm
	lib/WebGUI/Asset/Snippet.pm
	lib/WebGUI/Asset/Story.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/Template/TemplateToolkit.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Carousel.pm
	lib/WebGUI/Asset/Wobject/Collaboration.pm
	lib/WebGUI/Asset/Wobject/Dashboard.pm
	lib/WebGUI/Asset/Wobject/DataForm.pm
	lib/WebGUI/Asset/Wobject/Folder.pm
	lib/WebGUI/Asset/Wobject/Map.pm
	lib/WebGUI/Asset/Wobject/Search.pm
	lib/WebGUI/Asset/Wobject/Shelf.pm
	lib/WebGUI/Asset/Wobject/StockData.pm
	lib/WebGUI/Asset/Wobject/StoryTopic.pm
	lib/WebGUI/Asset/Wobject/SyndicatedContent.pm
	lib/WebGUI/Asset/Wobject/Thingy.pm
	lib/WebGUI/Asset/Wobject/WeatherData.pm
	lib/WebGUI/AssetClipboard.pm
	lib/WebGUI/AssetCollateral/DataForm/Entry.pm
	lib/WebGUI/AssetExportHtml.pm
	lib/WebGUI/AssetLineage.pm
	lib/WebGUI/AssetMetaData.pm
	lib/WebGUI/AssetTrash.pm
	lib/WebGUI/AssetVersioning.pm
	lib/WebGUI/Auth.pm
	lib/WebGUI/Cache/CHI.pm
	lib/WebGUI/Content/AssetManager.pm
	lib/WebGUI/Fork/ProgressBar.pm
	lib/WebGUI/Form/JsonTable.pm
	lib/WebGUI/Form/TimeField.pm
	lib/WebGUI/Form/Zipcode.pm
	lib/WebGUI/Group.pm
	lib/WebGUI/International.pm
	lib/WebGUI/Macro/AssetProxy.pm
	lib/WebGUI/Macro/FileUrl.pm
	lib/WebGUI/Operation/SSO.pm
	lib/WebGUI/Operation/User.pm
	lib/WebGUI/Role/Asset/Subscribable.pm
	lib/WebGUI/Shop/Cart.pm
	lib/WebGUI/Shop/Transaction.pm
	lib/WebGUI/Shop/TransactionItem.pm
	lib/WebGUI/Test.pm
	lib/WebGUI/URL/Content.pm
	lib/WebGUI/URL/Uploads.pm
	lib/WebGUI/User.pm
	lib/WebGUI/Workflow/Activity/ExtendCalendarRecurrences.pm
	lib/WebGUI/Workflow/Activity/SendNewsletters.pm
	lib/WebGUI/i18n/English/Asset.pm
	lib/WebGUI/i18n/English/WebGUI.pm
	sbin/installClass.pl
	sbin/rebuildLineage.pl
	sbin/search.pl
	sbin/testEnvironment.pl
	t/Asset/Asset.t
	t/Asset/AssetClipboard.t
	t/Asset/AssetLineage.t
	t/Asset/AssetMetaData.t
	t/Asset/Event.t
	t/Asset/File.t
	t/Asset/File/Image.t
	t/Asset/Post/notification.t
	t/Asset/Sku.t
	t/Asset/Story.t
	t/Asset/Template.t
	t/Asset/Wobject/Collaboration/templateVariables.t
	t/Asset/Wobject/Collaboration/unarchiveAll.t
	t/Asset/Wobject/Shelf.t
	t/Auth.t
	t/Macro/EditableToggle.t
	t/Macro/FilePump.t
	t/Shop/Cart.t
	t/Shop/Transaction.t
	t/Storage.t
	t/User.t
	t/Workflow.t
This commit is contained in:
Doug Bell 2011-05-13 18:15:11 -05:00
commit 277faae8a1
783 changed files with 32041 additions and 25495 deletions
Download patch file Download diff file Expand all files Collapse all files

1
t/Macro/AdminToggle.t
View file

@ -103,6 +103,7 @@ sub addTemplate {
template => "HREF=<tmpl_var toggle_url>\nLABEL=<tmpl_var toggle_text>",
id => 'AdminToggleTemplate--Z',
usePacked => 0,
parser => 'WebGUI::Asset::Template::HTMLTemplate',
};
my $template = $importNode->addChild($properties, $properties->{id});
return $template;

22
t/Macro/AssetProxy.t
View file

@ -12,24 +12,22 @@ use strict;
use WebGUI::Test;
use WebGUI::Session;
use HTML::TokeParser;
use WebGUI::Asset;
use Test::More; # increment this value for each test you create
my $session = WebGUI::Test->session;
my $numTests = 0;
plan tests => 2;
$numTests += 1; #For the use_ok
use WebGUI::Macro::AssetProxy;
plan tests => $numTests;
$session->asset(WebGUI::Asset->getDefault($session));
my $macro = 'WebGUI::Macro::AssetProxy';
my $loaded = use_ok($macro);
SKIP: {
skip "Unable to load $macro", $numTests-1 unless $loaded;
}
my $output;
$output = WebGUI::Macro::AssetProxy::process($session);
is $output, undef, 'calling AssetProxy with no identifier returns no error message in normal mode';
$session->user({userId => 3});
$output = WebGUI::Macro::AssetProxy::process($session);
like $output, qr/Invalid Asset URL/, '..., adminOn, return error message';

1
t/Macro/FilePump.t
View file

@ -33,6 +33,7 @@ plan tests => 11;
# put your tests here
my $bundle = WebGUI::FilePump::Bundle->new($session, { bundleName => 'test bundle'});
WebGUI::Test->addToCleanup( sub { $bundle->delete } );
my $root = WebGUI::Test->asset;

1
t/Macro/GroupAdd.t
View file

@ -156,6 +156,7 @@ sub setupTest {
my $properties = {
title => 'GroupAdd test template',
className => 'WebGUI::Asset::Template',
parser => 'WebGUI::Asset::Template::HTMLTemplate',
url => 'groupadd-test',
namespace => 'Macro/GroupAdd',
template => qq|{"HREF":"<tmpl_var group.url>",\n"LABEL":"<tmpl_var group.text>"}|,

1
t/Macro/GroupDelete.t
View file

@ -155,6 +155,7 @@ sub setupTest {
my $properties = {
title => 'GroupDelete test template',
className => 'WebGUI::Asset::Template',
parser => 'WebGUI::Asset::Template::HTMLTemplate',
url => 'groupdelete-test',
namespace => 'Macro/GroupDelete',
template => "HREF=<tmpl_var group.url>\nLABEL=<tmpl_var group.text>",

2
t/Macro/H_homeLink.t
View file

@ -93,6 +93,7 @@ sub addTemplate {
my $properties = {
title => 'H_homeLink test template',
className => 'WebGUI::Asset::Template',
parser => 'WebGUI::Asset::Template::HTMLTemplate',
url => 'h_homelink-test',
namespace => 'Macro/H_homeLink',
template => "HREF=<tmpl_var homeLink.url>\nLABEL=<tmpl_var homeLink.text>",
@ -100,7 +101,6 @@ sub addTemplate {
usePacked => 1,
};
my $template = $importNode->addChild($properties, $properties->{id});
WebGUI::Test->addToCleanup($template);
return ($template);
}

1
t/Macro/L_loginBox.t
View file

@ -200,6 +200,7 @@ sub setupTest {
my $properties = {
title => 'L_loginBox test template',
className => 'WebGUI::Asset::Template',
parser => 'WebGUI::Asset::Template::HTMLTemplate',
url => 'L-loginbox-test',
namespace => 'Macro/L_loginBox',
groupIdEdit => 3,

65
t/Macro/LastUpdatedBy.t Normal file
View file

@ -0,0 +1,65 @@
#-------------------------------------------------------------------
# WebGUI is Copyright 2001-2009 Plain Black Corporation.
#-------------------------------------------------------------------
# Please read the legal notices (docs/legal.txt) and the license
# (docs/license.txt) that came with this distribution before using
# this software.
#-------------------------------------------------------------------
# http://www.plainblack.com info@plainblack.com
#-------------------------------------------------------------------
use FindBin;
use strict;
use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Session;
use WebGUI::User;
use WebGUI::Macro::LastUpdatedBy;
use Test::More; # increment this value for each test you create
my $session = WebGUI::Test->session;
$session->user({userId => 1});
my $homeAsset = WebGUI::Test->asset;
my $numTests = 3;
plan tests => $numTests;
my $output = WebGUI::Macro::LastUpdatedBy::process($session);
is($output, '', "Macro returns '' if no asset is defined");
##Make the homeAsset the default asset in the session.
$session->asset($homeAsset);
my $revised_user = WebGUI::User->new($session, 'new');
$revised_user->username('Andy');
WebGUI::Test->addToCleanup($revised_user);
$session->user({user => $revised_user});
my $root = WebGUI::Asset->getRoot($session);
my %properties_A = (
className => 'WebGUI::Asset',
title => 'Asset A',
url => 'asset-a',
ownerUserId => 3,
groupIdView => 7,
groupIdEdit => 3,
id => '1',
# '1234567890123456789012',
);
my $assetA = $root->addChild(\%properties_A, $properties_A{id});
$session->asset($assetA);
$output = WebGUI::Macro::LastUpdatedBy::process($session);
is($output, 'Andy', 'Default asset last revised by andy');
$revised_user->delete;
#$revised_user->uncache;
$output = WebGUI::Macro::LastUpdatedBy::process($session);
is($output, 'Unknown', 'macro returns Unknown when the user object cannot be found');

1
t/Macro/LoginToggle.t
View file

@ -182,6 +182,7 @@ sub setupTest {
my $properties = {
title => 'LoginToggle test template',
className => 'WebGUI::Asset::Template',
parser => 'WebGUI::Asset::Template::HTMLTemplate',
url => 'editabletoggle-test',
namespace => 'Macro/LoginToggle',
template => "HREF=<tmpl_var toggle.url>\nLABEL=<tmpl_var toggle.text>",

2
t/Macro/MiniCart.t
View file

@ -140,6 +140,6 @@ sub setupJSONtemplate {
]
}
EOTMPL
my $template = WebGUI::Asset->getImportNode($session)->addChild({className=>'WebGUI::Asset::Template', namespace => 'Shop/MiniCart', template=>$templateBody});
my $template = WebGUI::Asset->getImportNode($session)->addChild({className=>'WebGUI::Asset::Template', parser => 'WebGUI::Asset::Template::HTMLTemplate', namespace => 'Shop/MiniCart', template=>$templateBody});
return $template;
}

2
t/Macro/UsersOnline.t
View file

@ -231,7 +231,7 @@ sub setupJSONtemplate {
]
}
EOTMPL
my $template = WebGUI::Asset->getImportNode($session)->addChild({className=>'WebGUI::Asset::Template', namespace => 'Macro/UsersOnline', template=>$templateBody});
my $template = WebGUI::Asset->getImportNode($session)->addChild({className=>'WebGUI::Asset::Template', parser => 'WebGUI::Asset::Template::HTMLTemplate', namespace => 'Macro/UsersOnline', template=>$templateBody});
addToCleanup($template);
return $template;
}

1
t/Macro/a_account.t
View file

@ -86,6 +86,7 @@ sub addTemplate {
my $properties = {
title => 'a_account test template',
className => 'WebGUI::Asset::Template',
parser => 'WebGUI::Asset::Template::HTMLTemplate',
url => 'a_account-test',
namespace => 'Macro/a_account',
template => "HREF=<tmpl_var account_url>\nLABEL=<tmpl_var account_text>",

1
t/Macro/r_printable.t
View file

@ -112,6 +112,7 @@ sub setupTest {
my $properties = {
title => 'printable test template',
className => 'WebGUI::Asset::Template',
parser => 'WebGUI::Asset::Template::HTMLTemplate',
url => 'printable-test',
namespace => 'Macro/r_printable',
template => "HREF=<tmpl_var printable.url>\nLABEL=<tmpl_var printable.text>",