diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 402d811ff..2374af792 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -1655,7 +1655,8 @@ sub processPropertiesFromFormPost { =head2 processTemplate ( vars, templateId, template ) -Returns the content generated from this template. +Returns the content generated from this template. It adds the Asset control +bar to the template variables, as well as all Asset properties and metadata. =head3 hashRef diff --git a/lib/WebGUI/Help/Asset_Article.pm b/lib/WebGUI/Help/Asset_Article.pm index be81d8ed9..f52d11342 100644 --- a/lib/WebGUI/Help/Asset_Article.pm +++ b/lib/WebGUI/Help/Asset_Article.pm @@ -58,6 +58,10 @@ our $HELP = { namespace => "Asset", tag => "asset template" }, + { + tag => 'pagination template variables', + namespace => 'WebGUI' + }, ], fields => [ ], @@ -151,14 +155,6 @@ our $HELP = { tag => 'article add/edit', namespace => 'Asset_Article' }, - { - tag => 'pagination template variables', - namespace => 'WebGUI' - }, - { - tag => 'wobject template', - namespace => 'Asset_Wobject' - } ] }, }; diff --git a/lib/WebGUI/Help/Asset_Dashboard.pm b/lib/WebGUI/Help/Asset_Dashboard.pm index da7d036ee..ecba74787 100644 --- a/lib/WebGUI/Help/Asset_Dashboard.pm +++ b/lib/WebGUI/Help/Asset_Dashboard.pm @@ -4,6 +4,12 @@ our $HELP = { 'dashboard add/edit' => { title => 'dashboard add/edit title', body => 'dashboard add/edit body', + isa => [ + { + namespace => "Asset_Wobject", + tag => "wobject add/edit" + }, + ], fields => [ { title => 'dashboard template field label', diff --git a/lib/WebGUI/Help/Asset_DataForm.pm b/lib/WebGUI/Help/Asset_DataForm.pm index 6a8e31cd8..6e6eaba64 100644 --- a/lib/WebGUI/Help/Asset_DataForm.pm +++ b/lib/WebGUI/Help/Asset_DataForm.pm @@ -178,6 +178,16 @@ our $HELP = { body => '83', fields => [ ], + isa => [ + { + namespace => "Asset_Template", + tag => "template variables" + }, + { + tag => 'wobject template', + namespace => 'Asset_Wobject' + } + ], variables => [ { 'name' => 'canEdit' @@ -394,10 +404,6 @@ our $HELP = { tag => 'data form add/edit', namespace => 'Asset_DataForm' }, - { - tag => 'wobject template', - namespace => 'Asset_Wobject' - } ] }, diff --git a/lib/WebGUI/Session/ErrorHandler.pm b/lib/WebGUI/Session/ErrorHandler.pm index 105ff2281..6134242c9 100644 --- a/lib/WebGUI/Session/ErrorHandler.pm +++ b/lib/WebGUI/Session/ErrorHandler.pm @@ -373,7 +373,8 @@ sub session { =head2 showDebug ( ) -Creates an HTML formatted string +Creates an HTML formatted string of all internally stored debug information, warns, +errors, sql queries and form data. =cut @@ -395,9 +396,9 @@ sub showDebug { } } $text = JSON::objToJson($form, {pretty => 1, indent => 4, autoconv=>0, skipinvalid=>1}); - $text =~ s/&/&/xsg; - $text =~ s/>/>/xsg; - $text =~ s//>/sg; + $text =~ s/\n/g; $text =~ s/ /    /g; $output .= '
'.$text."
\n"; diff --git a/lib/WebGUI/i18n/English/Macro_r_printable.pm b/lib/WebGUI/i18n/English/Macro_r_printable.pm index 28f1ab3d2..37c669331 100644 --- a/lib/WebGUI/i18n/English/Macro_r_printable.pm +++ b/lib/WebGUI/i18n/English/Macro_r_printable.pm @@ -25,8 +25,8 @@ our $I18N = { 'printable body' => { message => q|

^r(link text);
-^r("",custom style name);/b>
-^r("",custom style id,custom template URL);/b>
+^r("",custom style name);
+^r("",custom style id,custom template URL);
Creates a link to alter the style from a page to make it printable.