- fixed bug 11997: maximumAssets is ignored

- fixed bug 11998: maximumAssets prevents editing existing assets if maximum is reached
This commit is contained in:
Arjan Widlaak 2010-12-17 23:06:27 +01:00
parent e222cd97b6
commit 3d79b8b26c
2 changed files with 4 additions and 2 deletions

View file

@ -2999,10 +2999,10 @@ sub www_editSave {
my $isNewAsset = $session->form->process("assetId") eq "new" ? 1 : 0;
return $session->privilege->locked() if (!$self->canEditIfLocked and !$isNewAsset);
return $session->privilege->insufficient() unless $self->canEdit && $session->form->validToken;
if ($self->session->config("maximumAssets")) {
if ($self->session->config->get("maximumAssets")) {
my ($count) = $self->session->db->quickArray("select count(*) from asset");
my $i18n = WebGUI::International->new($self->session, "Asset");
return $self->session->style->userStyle($i18n->get("over max assets")) if ($self->session->config("maximumAssets") <= $count);
return $self->session->style->userStyle($i18n->get("over max assets")) if ( $self->session->config->get("maximumAssets") <= $count && $isNewAsset );
}
my $object;
if ($isNewAsset) {