projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Überarbeitung Speichern von Buchungsgruppen
[kivitendo-erp.git]
/
SL
/
DB
/
RequirementSpec.pm
diff --git
a/SL/DB/RequirementSpec.pm
b/SL/DB/RequirementSpec.pm
index
2354440
..
1cc1771
100644
(file)
--- a/
SL/DB/RequirementSpec.pm
+++ b/
SL/DB/RequirementSpec.pm
@@
-8,6
+8,11
@@
use Rose::DB::Object::Helpers;
use SL::DB::MetaSetup::RequirementSpec;
use SL::DB::Manager::RequirementSpec;
use SL::DB::MetaSetup::RequirementSpec;
use SL::DB::Manager::RequirementSpec;
+use SL::DB::Helper::AttrDuration;
+use SL::DB::Helper::CustomVariables (
+ module => 'RequirementSpecs',
+ cvars_alias => 1,
+);
use SL::DB::Helper::LinkedRecords;
use SL::Locale::String;
use SL::Util qw(_hashify);
use SL::DB::Helper::LinkedRecords;
use SL::Locale::String;
use SL::Util qw(_hashify);
@@
-52,6
+57,8
@@
__PACKAGE__->meta->add_relationship(
__PACKAGE__->meta->initialize;
__PACKAGE__->meta->initialize;
+__PACKAGE__->attr_duration(qw(time_estimation));
+
__PACKAGE__->before_save('_before_save_initialize_not_null_columns');
sub validate {
__PACKAGE__->before_save('_before_save_initialize_not_null_columns');
sub validate {
@@
-168,12
+175,17
@@
sub _copy_from {
%attributes);
}
%attributes);
}
+ # Copy custom variables.
+ foreach my $var (@{ $source->cvars_by_config }) {
+ $self->cvar_by_name($var->config->name)->value($var->value);
+ }
+
my %paste_template_result;
# Clone text blocks and pictures.
my %paste_template_result;
# Clone text blocks and pictures.
- my $clone_
picture
= sub {
- my ($
picture
) = @_;
- my $cloned = Rose::DB::Object::Helpers::clone_and_reset($
picture
);
+ my $clone_
and_reset_position
= sub {
+ my ($
src_obj
) = @_;
+ my $cloned = Rose::DB::Object::Helpers::clone_and_reset($
src_obj
);
$cloned->position(undef);
return $cloned;
};
$cloned->position(undef);
return $cloned;
};
@@
-182,7
+194,7
@@
sub _copy_from {
my ($text_block) = @_;
my $cloned = Rose::DB::Object::Helpers::clone_and_reset($text_block);
$cloned->position(undef);
my ($text_block) = @_;
my $cloned = Rose::DB::Object::Helpers::clone_and_reset($text_block);
$cloned->position(undef);
- $cloned->pictures([ map { $clone_
picture
->($_) } @{ $text_block->pictures_sorted } ]);
+ $cloned->pictures([ map { $clone_
and_reset_position
->($_) } @{ $text_block->pictures_sorted } ]);
return $cloned;
};
return $cloned;
};
@@
-194,8
+206,13
@@
sub _copy_from {
$self->add_text_blocks($paste_template_result{text_blocks});
}
$self->add_text_blocks($paste_template_result{text_blocks});
}
+ # Clone additional parts.
+ $paste_template_result{parts} = [ map { $clone_and_reset_position->($_) } @{ $source->parts } ];
+ my $accessor = $params->{paste_template} ? "add_parts" : "parts";
+ $self->$accessor($paste_template_result{parts});
+
# Save new object -- we need its ID for the items.
# Save new object -- we need its ID for the items.
- $self->save;
+ $self->save
(cascade => 1)
;
my %id_to_clone;
my %id_to_clone;