From cea9786d98b54c8ac300761df421709f25b2546c Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Fri, 30 Sep 2011 15:14:13 -0700 Subject: [PATCH] Updated to work with getEditForm. --- lib/WebGUI/Asset/Sku/EMSRibbon.pm | 48 +++++++++---------------------- lib/WebGUI/Asset/Sku/EMSTicket.pm | 35 +--------------------- 2 files changed, 15 insertions(+), 68 deletions(-) diff --git a/lib/WebGUI/Asset/Sku/EMSRibbon.pm b/lib/WebGUI/Asset/Sku/EMSRibbon.pm index b24578145..15cca9dca 100644 --- a/lib/WebGUI/Asset/Sku/EMSRibbon.pm +++ b/lib/WebGUI/Asset/Sku/EMSRibbon.pm @@ -93,6 +93,20 @@ sub getConfiguredTitle { #------------------------------------------------------------------- +=head2 getEditForm + +Extend the base class so that the user is returned to the viewAll screen after adding/editing +a ribbon. + +=cut + +override getEditForm => sub { + my $form = super(); + $form->addField('hidden', name => 'proceed', value => 'viewAll',); +}; + +#------------------------------------------------------------------- + =head2 getMaxAllowedInCart Return 1; @@ -239,40 +253,6 @@ sub www_delete { } -#------------------------------------------------------------------- - -=head2 www_edit () - -Displays the edit form. - -=cut - -sub www_edit { - my ($self) = @_; - return $self->session->privilege->insufficient() unless $self->canEdit; - return $self->session->privilege->locked() unless $self->canEditIfLocked; - $self->session->style->setRawHeadTags(q| - - |); - my $i18n = WebGUI::International->new($self->session, "Asset_EventManagementSystem"); - my $form = $self->getEditForm; - $form->addField( "hidden", name=>'proceed', value=>'viewAll', ); - return $self->processStyle('

'.$i18n->get('ems ribbon').'

'.$form->toHtml); -} - #------------------------------------------------------------------- =head2 www_viewAll () diff --git a/lib/WebGUI/Asset/Sku/EMSTicket.pm b/lib/WebGUI/Asset/Sku/EMSTicket.pm index 94c6d7950..a040a2623 100644 --- a/lib/WebGUI/Asset/Sku/EMSTicket.pm +++ b/lib/WebGUI/Asset/Sku/EMSTicket.pm @@ -275,6 +275,7 @@ override getEditForm => sub { defaultValue => $date->toDatabase, value => $self->startDate, ); + $form->addField('hidden', name => 'proceed', value => 'viewAll',); return $form; }; @@ -545,40 +546,6 @@ sub www_delete { } -#------------------------------------------------------------------- - -=head2 www_edit () - -Displays the edit form. - -=cut - -sub www_edit { - my ($self) = @_; - return $self->session->privilege->insufficient() unless $self->canEdit; - return $self->session->privilege->locked() unless $self->canEditIfLocked; - $self->session->style->setRawHeadTags(q| - - |); - my $i18n = WebGUI::International->new($self->session, "Asset_EventManagementSystem"); - my $form = $self->getEditForm; - $form->addField( "hidden", name=>'proceed', value=>'viewAll'); - return $self->processStyle('

'.$i18n->get('ems ticket').'

'.$form->toHtml); -} - #------------------------------------------------------------------- =head2 www_viewAll ()