Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 65987c7f

Von Tamino Steinert vor etwa 1 Jahr hinzugefügt

  • ID 65987c7ffdefad559c6cea991ed7aab254cb03b9
  • Vorgänger 4c84466a
  • Nachfolger 71b7d7ca

S:D:ValidityToken: Scope von Order auf Record geändert ...

Später für alle Belege verwenden.

Unterschiede anzeigen:

SL/Controller/Order.pm
$self->pre_render();
if (!$::form->{form_validity_token}) {
$::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_ORDER_SAVE())->token;
$::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_RECORD_SAVE())->token;
}
$self->render(
......
$_->{render_second_row} = 1 for @{ $self->order->items_sorted };
if (!$::form->{form_validity_token}) {
$::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_ORDER_SAVE())->token;
$::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_RECORD_SAVE())->token;
}
}
......
}
if (!$::form->{form_validity_token}) {
$::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_ORDER_SAVE())->token;
$::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_RECORD_SAVE())->token;
}
# save
......
$_->{render_second_row} = 1 for @{ $self->order->items_sorted };
if (!$::form->{form_validity_token}) {
$::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_ORDER_SAVE())->token;
$::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_RECORD_SAVE())->token;
}
$self->render(
......
$_->{render_longdescription} = 1 for @{ $self->order->items_sorted };
if (!$::form->{form_validity_token}) {
$::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_ORDER_SAVE())->token;
$::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_RECORD_SAVE())->token;
}
$self->render(
......
: undef;
SL::Model::Record->save($self->order,
with_validity_token => { scope => SL::DB::ValidityToken::SCOPE_ORDER_SAVE(), token => $::form->{form_validity_token} },
with_validity_token => { scope => SL::DB::ValidityToken::SCOPE_RECORD_SAVE(), token => $::form->{form_validity_token} },
delete_custom_shipto => $self->is_custom_shipto_to_delete || $self->order->custom_shipto->is_empty,
items_to_delete => $items_to_delete,
objects_to_close => $objects_to_close,
SL/Controller/RecordBase.pm
use SL::Helper::Flash qw(flash flash_later);
use SL::DB::ValidityToken;
use Rose::Object::MakeMethods::Generic(
scalar => [ qw(
item_ids_to_delete is_custom_shipto_to_delete
......
$self->pre_render();
if (!$::form->{form_validity_token}) {
$::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_ORDER_SAVE())->token; # TODO remove scope
$::form->{form_validity_token} = SL::DB::ValidityToken->create(scope => SL::DB::ValidityToken::SCOPE_RECORD_SAVE())->token;
}
$self->render(
SL/DB/ValidityToken.pm
__PACKAGE__->meta->initialize;
use constant SCOPE_RECORD_SAVE => 'Record::Save';
use constant SCOPE_SALES_INVOICE_POST => 'SalesInvoice::Post';
use constant SCOPE_PURCHASE_INVOICE_POST => 'PurchaseInvoice::Post';
use constant SCOPE_DELIVERY_ORDER_SAVE => 'DeliveryOrder::Save';
use constant SCOPE_ORDER_SAVE => 'Order::Save';
use constant SCOPE_RECLAMATION_SAVE => 'Reclamation::Save';
use constant SCOPE_GL_TRANSACTION_POST => 'GLTransaction::Post';

Auch abrufbar als: Unified diff