projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
34985df
)
Auftrags-Controller: js accessor angepasst
author
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Thu, 24 Sep 2015 15:08:31 +0000
(17:08 +0200)
committer
G. Richardson
<information@kivitendo-premium.de>
Mon, 16 Nov 2015 15:15:58 +0000
(16:15 +0100)
SL/Controller/Order.pm
patch
|
blob
|
history
diff --git
a/SL/Controller/Order.pm
b/SL/Controller/Order.pm
index
e6ab2ae
..
bd20669
100644
(file)
--- a/
SL/Controller/Order.pm
+++ b/
SL/Controller/Order.pm
@@
-4,7
+4,6
@@
use strict;
use parent qw(SL::Controller::Base);
use SL::Helper::Flash;
use parent qw(SL::Controller::Base);
use SL::Helper::Flash;
-use SL::ClientJS;
use SL::Presenter;
use SL::Locale::String;
use SL::SessionFile::Random;
use SL::Presenter;
use SL::Locale::String;
use SL::SessionFile::Random;
@@
-29,7
+28,7
@@
use English qw(-no_match_vars);
use Rose::Object::MakeMethods::Generic
(
use Rose::Object::MakeMethods::Generic
(
- 'scalar --get_set_init' => [ qw(order valid_types type cv
js
p) ],
+ 'scalar --get_set_init' => [ qw(order valid_types type cv p) ],
);
);
@@
-94,7
+93,7
@@
sub action_save {
if (scalar @{ $errors }) {
$self->js->flash('error', $_) foreach @{ $errors };
if (scalar @{ $errors }) {
$self->js->flash('error', $_) foreach @{ $errors };
- return $self->js->render(
$self
);
+ return $self->js->render();
}
flash_later('info', $::locale->text('The order has been saved'));
}
flash_later('info', $::locale->text('The order has been saved'));
@@
-218,7
+217,7
@@
sub action_save_and_delivery_order {
if (scalar @{ $errors }) {
$self->js->flash('error', $_) foreach @{ $errors };
if (scalar @{ $errors }) {
$self->js->flash('error', $_) foreach @{ $errors };
- return $self->js->render(
$self
);
+ return $self->js->render();
}
my $delivery_order = $self->order->convert_to_delivery_order($self->order);
}
my $delivery_order = $self->order->convert_to_delivery_order($self->order);
@@
-315,7
+314,7
@@
sub action_add_item {
->focus('#add_item_parts_id_name');
$self->_js_redisplay_amounts_and_taxes;
->focus('#add_item_parts_id_name');
$self->_js_redisplay_amounts_and_taxes;
- $self->js->render(
$self
);
+ $self->js->render();
}
sub action_recalc_amounts_and_taxes {
}
sub action_recalc_amounts_and_taxes {
@@
-325,7
+324,7
@@
sub action_recalc_amounts_and_taxes {
$self->_js_redisplay_linetotals;
$self->_js_redisplay_amounts_and_taxes;
$self->_js_redisplay_linetotals;
$self->_js_redisplay_amounts_and_taxes;
- $self->js->render(
$self
);
+ $self->js->render();
}
sub _js_redisplay_linetotals {
}
sub _js_redisplay_linetotals {
@@
-386,10
+385,6
@@
sub init_cv {
return $cv;
}
return $cv;
}
-sub init_js {
- SL::ClientJS->new;
-}
-
sub init_p {
SL::Presenter->get;
}
sub init_p {
SL::Presenter->get;
}