Snippets can now select a template parser
(instead of being restricted to the configured default)
This commit is contained in:
parent
3ad6c4eb3a
commit
3531c4d913
8 changed files with 197 additions and 34 deletions
|
|
@ -63,6 +63,7 @@ sub definition {
|
|||
my $session = shift;
|
||||
my $definition = shift;
|
||||
my $i18n = WebGUI::International->new($session,"Asset_Snippet");
|
||||
my $t18n = WebGUI::International->new($session,'Asset_Template');
|
||||
my %properties;
|
||||
tie %properties, 'Tie::IxHash';
|
||||
%properties = (
|
||||
|
|
@ -94,13 +95,14 @@ sub definition {
|
|||
label => $i18n->get("cache timeout"),
|
||||
hoverHelp => $i18n->get("cache timeout help")
|
||||
},
|
||||
processAsTemplate=>{
|
||||
fieldType=>'yesNo',
|
||||
label=>$i18n->get('process as template'),
|
||||
hoverHelp=>$i18n->get('process as template description'),
|
||||
tab=>"properties",
|
||||
defaultValue=>0
|
||||
},
|
||||
templateParser => {
|
||||
fieldType => 'templateParser',
|
||||
allowNone => 1,
|
||||
label => $t18n->get('parser'),
|
||||
hoverHelp => $t18n->get('parser description'),
|
||||
tab => 'properties',
|
||||
defaultValue => '',
|
||||
},
|
||||
mimeType=>{
|
||||
tab=>"properties",
|
||||
hoverHelp=>$i18n->get('mimeType description'),
|
||||
|
|
@ -312,8 +314,10 @@ sub view {
|
|||
: $self->get('snippet')
|
||||
;
|
||||
$output = $self->getToolbar.$output if ($session->var->isAdminOn && !$calledAsWebMethod);
|
||||
if ($self->getValue("processAsTemplate")) {
|
||||
$output = WebGUI::Asset::Template->processRaw($session, $output, $self->get);
|
||||
if (my $parser = $self->getValue('templateParser')) {
|
||||
$output = WebGUI::Asset::Template->processRaw(
|
||||
$session, $output, $self->get, $parser
|
||||
);
|
||||
}
|
||||
WebGUI::Macro::process($session,\$output);
|
||||
unless ($noCache) {
|
||||
|
|
|
|||
|
|
@ -140,9 +140,8 @@ sub definition {
|
|||
defaultValue => 1,
|
||||
},
|
||||
parser => {
|
||||
noFormPost => 1,
|
||||
fieldType => 'selectBox',
|
||||
defaultValue => [$session->config->get("defaultTemplateParser")],
|
||||
fieldType => 'templateParser',
|
||||
defaultValue => $session->config->get('defaultTemplateParser'),
|
||||
},
|
||||
namespace => {
|
||||
fieldType => 'combo',
|
||||
|
|
@ -404,22 +403,12 @@ sub getEditForm {
|
|||
templatePreview.js
|
||||
);
|
||||
|
||||
if($config->get("templateParsers")){
|
||||
my @temparray = @{$config->get("templateParsers")};
|
||||
tie my %parsers, 'Tie::IxHash';
|
||||
while(my $a = shift @temparray){
|
||||
$parsers{$a} = $self->getParser($session, $a)->getName();
|
||||
}
|
||||
my $value = [$self->getValue("parser")];
|
||||
$value = \[$config->get("defaultTemplateParser")] if(!$self->getValue("parser"));
|
||||
$properties->selectBox(
|
||||
-name=>"parser",
|
||||
-options=>\%parsers,
|
||||
-value=>$value,
|
||||
-label=>$i18n->get('parser'),
|
||||
-hoverHelp=>$i18n->get('parser description'),
|
||||
);
|
||||
}
|
||||
$properties->templateParser(
|
||||
name => 'parser',
|
||||
label => $i18n->get('parser'),
|
||||
hoverHelp => $i18n->get('parser description'),
|
||||
value => $self->getValue('parser'),
|
||||
);
|
||||
|
||||
$properties->jsonTable(
|
||||
name => 'attachmentsJson',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue