fix for editing interfaces to Assets that still display an edit button even if the Asset is edit locked.

This commit is contained in:
Colin Kuskie 2007-04-29 03:16:13 +00:00
parent 38060cc0cb
commit 8b7bafe1ae
19 changed files with 59 additions and 39 deletions

View file

@ -264,8 +264,9 @@ sub view {
#-------------------------------------------------------------------
sub www_edit {
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
my $i18n = WebGUI::International->new($self->session, 'Asset_Image');
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=resize'),$i18n->get("resize image")) if ($self->get("filename"));
my $tabform = $self->getEditForm;
@ -281,8 +282,9 @@ sub www_edit {
#-------------------------------------------------------------------
sub www_resize {
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
if ($self->session->form->process("newWidth") || $self->session->form->process("newHeight")) {
my $newSelf = $self->addRevision();
delete $newSelf->{_storageLocation};

View file

@ -239,12 +239,12 @@ Web facing method which is the default edit page
=cut
sub www_edit {
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("zip archive add/edit", "Asset_ZipArchive");
my $i18n = WebGUI::International->new($self->session,"Asset_ZipArchive");
return $self->getAdminConsole->render($self->getEditForm->print,
$i18n->get('zip archive add/edit title'));
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
$self->getAdminConsole->setHelp("zip archive add/edit", "Asset_ZipArchive");
my $i18n = WebGUI::International->new($self->session,"Asset_ZipArchive");
return $self->getAdminConsole->render($self->getEditForm->print, $i18n->get('zip archive add/edit title'));
}
#-------------------------------------------------------------------