projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auftrags-Controller: multi items dialog: JavaScript aus html-Template raus
[kivitendo-erp.git]
/
SL
/
Controller
/
CustomerVendor.pm
diff --git
a/SL/Controller/CustomerVendor.pm
b/SL/Controller/CustomerVendor.pm
index
86bba25
..
3b8f7fc
100644
(file)
--- a/
SL/Controller/CustomerVendor.pm
+++ b/
SL/Controller/CustomerVendor.pm
@@
-272,10
+272,16
@@
sub _transaction {
my $name = $::form->escape($self->{cv}->name, 1);
my $db = $self->is_vendor() ? 'vendor' : 'customer';
my $name = $::form->escape($self->{cv}->name, 1);
my $db = $self->is_vendor() ? 'vendor' : 'customer';
+ my $action = 'add';
+
+ if ($::instance_conf->get_feature_experimental && 'oe.pl' eq $script) {
+ $script = 'controller.pl';
+ $action = 'Order/' . $action;
+ }
my $url = $self->url_for(
controller => $script,
my $url = $self->url_for(
controller => $script,
- action =>
'add'
,
+ action =>
$action
,
vc => $db,
$db .'_id' => $self->{cv}->id,
$db => $name,
vc => $db,
$db .'_id' => $self->{cv}->id,
$db => $name,
@@
-640,7
+646,6
@@
sub action_ajaj_autocomplete {
}
sub action_test_page {
}
sub action_test_page {
- $::request->{layout}->add_javascripts('autocomplete_customer.js');
$_[0]->render('customer_vendor/test_page');
}
$_[0]->render('customer_vendor/test_page');
}
@@
-939,7
+944,6
@@
sub _pre_render {
$self->{template_args} ||= {};
$self->{template_args} ||= {};
- $::request->{layout}->add_javascripts('autocomplete_customer.js');
$::request->{layout}->add_javascripts('kivi.CustomerVendor.js');
$::request->{layout}->add_javascripts('kivi.File.js');
$::request->{layout}->add_javascripts('kivi.CustomerVendor.js');
$::request->{layout}->add_javascripts('kivi.File.js');