Make Macro/Thumbnail.t more robust by not running downstream tests if
the file does not exist. Fixed a bug I created by changing the order of update and change comparison in Asset/File.pm. This caused Asset/File.t, Asset/File/Image.t and Macro/Thumbnail.t to fail.
This commit is contained in:
parent
a7dde82421
commit
37f6db428f
2 changed files with 18 additions and 12 deletions
|
|
@ -382,6 +382,7 @@ sub update {
|
|||
edit => $self->get("groupIdEdit"),
|
||||
storageId => $self->get('storageId'),
|
||||
);
|
||||
$self->SUPER::update(@_);
|
||||
##update may have entered a new storageId. Reset the cached one just in case.
|
||||
if ($self->get("storageId") ne $before{storageId}) {
|
||||
$self->setStorageLocation;
|
||||
|
|
@ -389,7 +390,6 @@ sub update {
|
|||
if ($self->get("ownerUserId") ne $before{owner} || $self->get("groupIdEdit") ne $before{edit} || $self->get("groupIdView") ne $before{view}) {
|
||||
$self->getStorageLocation->setPrivileges($self->get("ownerUserId"),$self->get("groupIdView"),$self->get("groupIdEdit"));
|
||||
}
|
||||
$self->SUPER::update(@_);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue