fix for editing interfaces to Assets that still display an edit button even if the Asset is edit locked.
This commit is contained in:
parent
38060cc0cb
commit
8b7bafe1ae
19 changed files with 59 additions and 39 deletions
|
|
@ -1426,6 +1426,7 @@ sub www_edit {
|
|||
my $i18n = WebGUI::International->new($session, 'Asset_Calendar');
|
||||
|
||||
return $session->privilege->insufficient() unless $self->canEdit;
|
||||
return $session->privilege->locked() unless $self->canEditIfLocked;
|
||||
|
||||
$self->getAdminConsole->setHelp("Calendar add/edit", "Calendar");
|
||||
|
||||
|
|
|
|||
|
|
@ -1606,6 +1606,7 @@ Edit wobject method.
|
|||
sub www_edit {
|
||||
my $self = shift;
|
||||
return $self->session->privilege->insufficient() unless $self->canEdit;
|
||||
return $self->session->privilege->locked() unless $self->canEditIfLocked;
|
||||
my ($tag) = ($self->get("className") =~ /::(\w+)$/);
|
||||
my $tag2 = $tag;
|
||||
$tag =~ s/([a-z])([A-Z])/$1 $2/g; #Separate studly caps
|
||||
|
|
|
|||
|
|
@ -296,11 +296,12 @@ order by department, lastName, firstName";
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_edit {
|
||||
my $self = shift;
|
||||
return $self->session->privilege->insufficient() unless $self->canEdit;
|
||||
$self->getAdminConsole->setHelp("in out board add/edit","Asset_InOutBoard");
|
||||
my $self = shift;
|
||||
return $self->session->privilege->insufficient() unless $self->canEdit;
|
||||
return $self->session->privilege->locked() unless $self->canEditIfLocked;
|
||||
$self->getAdminConsole->setHelp("in out board add/edit","Asset_InOutBoard");
|
||||
my $i18n = WebGUI::International->new($self->session, "Asset_InOutBoard");
|
||||
return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get("18"));
|
||||
return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get("18"));
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -508,12 +508,12 @@ sub getEditForm {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
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_Matrix');
|
||||
$self->getAdminConsole->setHelp('matrix add/edit', 'Asset_Matrix');
|
||||
return $self->getAdminConsole->render($self->getEditForm->print,
|
||||
$i18n->get("edit matrix"));
|
||||
return $self->getAdminConsole->render($self->getEditForm->print, $i18n->get("edit matrix"));
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -181,6 +181,7 @@ adminConsole views.
|
|||
#sub www_edit {
|
||||
# my $self = shift;
|
||||
# return WebGUI::Privilege::insufficient() unless $self->canEdit;
|
||||
# return WebGUI::Privilege::locked() unless $self->canEditIfLocked;
|
||||
# $self->getAdminConsole->setHelp("new wobject add/edit", "NewWobject");
|
||||
# return $self->getAdminConsole->render($self->getEditForm->print,
|
||||
# WebGUI::International::get("edit_title","NewWobject"));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue