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

template type was not checked enough

Browse source
This commit is contained in:
Lucas Bartholemy 2006-06-06 16:50:17 +00:00
parent dd5c862246
commit 466abf8da9
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/6.x.x.txt
View file

@ -1,4 +1,5 @@
6.99.4
- fix: better checking of selected template type
- fix: SQLForm - added missing privilege check
- fix: typo in spectre
- fixed a bug where a user could transfer a negative amount of karma to a

21
lib/WebGUI/Asset/Template.pm
View file

@ -82,6 +82,7 @@ sub definition {
defaultValue=>1
},
parser=>{
noFormPost=>1,
fieldType=>'selectList',
defaultValue=>[$session->config->get("defaultTemplateParser")]
},
@ -98,6 +99,21 @@ sub definition {
return $class->SUPER::definition($session,$definition);
}
#-------------------------------------------------------------------
sub processPropertiesFromFormPost {
my $self = shift;
$self->SUPER::processPropertiesFromFormPost;
if ($self->getValue("parser") ne $self->session->form->process("parser","className") && ($self->session->form->process("parser","className") ne "")) {
my %data;
if (isIn($self->session->form->process("parser","className"),@{$self->session->config->get("templateParsers")})) {
%data = ( parser => $self->session->form->process("parser","className") );
} else {
%data = ( parser => $self->session->config->get("defaultTemplateParser") );
}
$self->update(\%data);
}
}
#-------------------------------------------------------------------
@ -173,9 +189,6 @@ sub getEditForm {
}
#-------------------------------------------------------------------
=head2 getList ( session, namespace )
@ -198,7 +211,7 @@ sub getList {
my $class = shift;
my $session = shift;
my $namespace = shift;
my $sql = "select asset.assetId, assetData.revisionDate from template left join asset on asset.assetId=template.assetId left join assetData on assetData.revisionDate=template.revisionDate and assetData.assetId=template.assetId where template.namespace=".$session->db->quote($namespace)." and template.showInForms=1 and asset.state='published' and assetData.revisionDate=(SELECT max(revisionDate) from assetData where assetData.assetId=asset.assetId and (assetData.status='approved' or assetData.tagId=".$session->db->quote($session->scratch->get("versionTag")).")) order by assetData.title";
my $sql = "select asset.assetId, assetData.revisionDate from template left join asset on asset.assetId=template.assetId left join assetData on assetData.revisionDate=template.revisionDate and assetData.assetId=template.assetId where template.namespace=".$session->db->quote($namespace)." and template.showInForms=1 and asset.state='published' and assetData.revisionDate=(SELECT max(revisionDate) from assetData where assetData.assetId=asset.assetId and (assetData.status='approved' or assetData.tagId=".$session->db->quote($session->scratch->get("versionTag")).")) order by assetData.title";
my $sth = $session->dbSlave->read($sql);
my %templates;
tie %templates, 'Tie::IxHash';