Add space to Add/Edit Event in the EMS.
Allow the Navigation Asset to set the MIME type of its output. Upgrade script, Wobject code, documentation. Add a new MimeType form element, stolen out of the Snippet and generalized for use.
This commit is contained in:
parent
3f7bffef88
commit
e06331cae9
10 changed files with 175 additions and 16 deletions
|
|
@ -76,7 +76,7 @@ sub definition {
|
|||
defaultValue=>0
|
||||
},
|
||||
mimeType=>{
|
||||
fieldType=>'text',
|
||||
fieldType=>'mimeType',
|
||||
defaultValue=>'text/html'
|
||||
}
|
||||
|
||||
|
|
@ -99,10 +99,6 @@ sub getEditForm {
|
|||
my $self = shift;
|
||||
my $tabform = $self->SUPER::getEditForm();
|
||||
my $i18n = WebGUI::International->new($self->session,"Asset_Snippet");
|
||||
my %mimeTypes;
|
||||
foreach ('text/html','text/css','text/javascript','text/plain','text/xml','application/xml') {
|
||||
$mimeTypes{$_}=$_;
|
||||
}
|
||||
$tabform->getTab("properties")->codearea(
|
||||
-name=>"snippet",
|
||||
-label=>$i18n->get('assetName'),
|
||||
|
|
@ -115,12 +111,11 @@ sub getEditForm {
|
|||
-hoverHelp=>$i18n->get('process as template description'),
|
||||
-value=>$self->getValue("processAsTemplate")
|
||||
);
|
||||
$tabform->getTab("properties")->combo(
|
||||
$tabform->getTab("properties")->mimeType(
|
||||
-name=>"mimeType",
|
||||
-label=>$i18n->get('mimeType'),
|
||||
-hoverHelp=>$i18n->get('mimeType description'),
|
||||
-value=>[$self->getValue('mimeType')],
|
||||
-options=>\%mimeTypes
|
||||
);
|
||||
|
||||
return $tabform;
|
||||
|
|
|
|||
|
|
@ -642,7 +642,7 @@ sub www_editEvent {
|
|||
my $output = $f->print;
|
||||
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=manageEvents'),$i18n->get("manage events"));
|
||||
my $addEdit = ($pid eq "new" or !$pid) ? $i18n->get('add', 'Wobject') : $i18n->get('edit', 'Wobject');
|
||||
return $self->getAdminConsole->render($output, $addEdit.$i18n->get('event'));
|
||||
return $self->getAdminConsole->render($output, $addEdit.' '.$i18n->get('event'));
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -38,6 +38,10 @@ sub definition {
|
|||
fieldType=>"template",
|
||||
defaultValue=>'PBtmpl0000000000000048'
|
||||
},
|
||||
mimeType =>{
|
||||
fieldType=>"mimeType",
|
||||
defaultValue=>'text/html'
|
||||
},
|
||||
assetsToInclude=>{
|
||||
fieldType=>'checkList',
|
||||
defaultValue=>"descendants"
|
||||
|
|
@ -86,6 +90,12 @@ sub getEditForm {
|
|||
-label=>$i18n->get(1096),
|
||||
-hoverHelp=>$i18n->get('1096 description'),
|
||||
);
|
||||
$tabform->getTab("display")->mimeType(
|
||||
-value=>$self->getValue('mimeType'),
|
||||
-name=>"mimeType",
|
||||
-label=>$i18n->get('mimeType'),
|
||||
-hoverHelp=>$i18n->get('mimeType description'),
|
||||
);
|
||||
$tabform->hidden({
|
||||
name=>"returnUrl",
|
||||
value=>$self->session->form->process("returnUrl")
|
||||
|
|
@ -447,7 +457,6 @@ sub view {
|
|||
($lastChildren{@{$var->{page_loop}}[$counter]->{"page.parent.assetId"}}
|
||||
eq @{$var->{page_loop}}[$counter]->{"page.assetId"});
|
||||
}
|
||||
#use Data::Dumper;$self->session->errorHandler->warn(Dumper($var));
|
||||
return $self->processTemplate($var,undef,$self->{_viewTemplate});
|
||||
}
|
||||
|
||||
|
|
@ -502,4 +511,24 @@ sub www_preview {
|
|||
return _submenu($output,"preview");
|
||||
}
|
||||
|
||||
1;
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 www_view
|
||||
|
||||
A web accessible version of the view method. The SUPER method is overridden so that we can serve
|
||||
other types aside from text/html.
|
||||
|
||||
=cut
|
||||
|
||||
sub www_view {
|
||||
my $self = shift;
|
||||
my $mimeType = $self->getValue('mimeType') || 'text/html';
|
||||
if ($mimeType eq 'text/html') {
|
||||
return $self->SUPER->www_view();
|
||||
}
|
||||
else {
|
||||
$self->prepareView();
|
||||
$self->session->http->setMimeType($mimeType || 'text/html');
|
||||
return $self->view();
|
||||
}
|
||||
}1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue