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

Forward port www_add/editSave fix for parents who are being edited.

Browse source
This commit is contained in:
Colin Kuskie 2008-12-16 01:24:26 +00:00
parent 71b16e3bb3
commit 7addce2dd6
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,7 @@
- fixed #9284: User manager broken if no LDAP links exits
- fixed #4136: Shortcut doesn't display all properties in override
- fixed #8838: Gallery Cross Publish template is broken
- fixed #8898: versioning problem
7.6.6
- fixed #8792: Image Preview gives ERROR in Collateral Manager

6
lib/WebGUI/Asset.pm
View file

@ -2573,7 +2573,9 @@ NOTE: Don't try to override or overload this method. It won't work. What you are
sub www_editSave {
my $self = shift;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
##If this is a new asset (www_add), the parent may be locked. We should still be able to add a new asset.
my $isNewAsset = $self->session->form->process("assetId") eq "new" ? 1 : 0;
return $self->session->privilege->locked() if (!$self->canEditIfLocked and !$isNewAsset);
return $self->session->privilege->insufficient() unless $self->canEdit;
if ($self->session->config("maximumAssets")) {
my ($count) = $self->session->db->quickArray("select count(*) from asset");
@ -2581,7 +2583,7 @@ sub www_editSave {
return $self->session->style->userStyle($i18n->get("over max assets")) if ($self->session->config("maximumAssets") <= $count);
}
my $object;
if ($self->session->form->process("assetId") eq "new") {
if ($isNewAsset) {
$object = $self->addChild({className=>$self->session->form->process("class","className")});
return $self->www_view unless defined $object;
$object->{_parent} = $self;