Merge commit WebGUI_7.6.9-beta into survey-rfe
* commit 'tags/WebGUI_7.6.9-beta': (31 commits) Release 7.6.9-beta preparing for 7.6.9 release fixed: Exporting to static files can leak large amounts of memory fixed: HTTP Proxy doesn't serve new content to visitors use to_json and from_json in more places instead of encode_json and decode_json Document the heretofore missing date template variable in Qualify a chained method call when getting Workflow instances. If the Attempt to fix IE6 bug fixed: ukplayer example is now loaded with swfobject.js released under the MIT licence, see gotcha's and /extras/ukplayer Added a style for printing Alumni pages Emails sent about low stock should have status unread, not completed. Moved draggable.js to extras/yui-webgui/build/layout since it is now a wrapper around YUI dragdrob Attributions in the changelog for a patch provided to fix a bug. whups, left in console.logs Updated draggable.js to wrap the YUI fixed #4137: Calendar Search page has extra head tags in body Fix a typo typo in the Operation/Workflow POD. Forward port Shelf view fix. Was not displaying child shelves, only self. Forward port the PayDriver bug fixes from 7.5 branch. Labels are always fixed #9264: new slideShow.swf uploaded in extras/ukplayer (United Knowledge/Arjan Widlak) ... Conflicts: lib/WebGUI/Asset/Wobject/Survey.pm
This commit is contained in:
commit
1376c8ae92
60 changed files with 999 additions and 1199 deletions
|
|
@ -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 => 15; # increment this value for each test you create
|
||||
use WebGUI::Asset::Snippet;
|
||||
|
||||
my $session = WebGUI::Test->session;
|
||||
|
|
@ -70,6 +70,24 @@ isnt ($wwwViewOutput, undef, 'www_view returns something');
|
|||
my $editOutput = $snippet->www_edit;
|
||||
isnt ($editOutput, undef, 'www_edit returns something');
|
||||
|
||||
$snippet->update({
|
||||
title => "authMethod",
|
||||
processAsTemplate => 1,
|
||||
cacheTimeout => 1,
|
||||
snippet => q|^SQL(select value from settings where name="<tmpl_var title>");|
|
||||
});
|
||||
|
||||
my $sqlMacroAdded = exists $session->config->get('macros')->{'SQL'};
|
||||
if (! $sqlMacroAdded) {
|
||||
$session->config->addToHash('macros', 'SQL', 'SQL');
|
||||
}
|
||||
|
||||
is($snippet->view(), 'WebGUI', 'Interpolating macros in works with template in the correct order');
|
||||
|
||||
if (! $sqlMacroAdded) {
|
||||
$session->config->deleteFromHash('macros', 'SQL');
|
||||
}
|
||||
|
||||
TODO: {
|
||||
local $TODO = "Tests to make later";
|
||||
ok(0, 'Test indexContent method');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue