projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update jQuery auf 1.9.1, jQuery-UI auf 1.10.1
[kivitendo-erp.git]
/
SL
/
Helper
/
Csv
/
Dispatcher.pm
diff --git
a/SL/Helper/Csv/Dispatcher.pm
b/SL/Helper/Csv/Dispatcher.pm
index
6375daf
..
add444b
100644
(file)
--- a/
SL/Helper/Csv/Dispatcher.pm
+++ b/
SL/Helper/Csv/Dispatcher.pm
@@
-78,7
+78,11
@@
sub parse_profile {
$self->unknown_column($col, undef);
}
} else {
$self->unknown_column($col, undef);
}
} else {
- push @specs, $self->make_spec($col, $profile->{$col} || $col);
+ if (exists $profile->{$col}) {
+ push @specs, $self->make_spec($col, $profile->{$col});
+ } else {
+ push @specs, $self->make_spec($col, $col);
+ }
}
}
}
}
@@
-91,8
+95,13
@@
sub make_spec {
my ($self, $col, $path) = @_;
my $spec = { key => $col, steps => [] };
my ($self, $col, $path) = @_;
my $spec = { key => $col, steps => [] };
+
+ return unless $path;
+
my $cur_class = $self->_csv->class;
my $cur_class = $self->_csv->class;
+ return unless $cur_class;
+
for my $step_index ( split /\.(?!\d)/, $path ) {
my ($step, $index) = split /\./, $step_index;
if ($cur_class->can($step)) {
for my $step_index ( split /\.(?!\d)/, $path ) {
my ($step, $index) = split /\./, $step_index;
if ($cur_class->can($step)) {