Lines 49-55
foreach my $subscriptionid (@subscriptionids) {
Link Here
|
49 |
push @subscriptions, $subscription if $subscription; |
49 |
push @subscriptions, $subscription if $subscription; |
50 |
} |
50 |
} |
51 |
|
51 |
|
52 |
my @available_additional_fields = Koha::AdditionalFields->search( { tablename => 'subscription' } )->as_list; |
52 |
my $available_additional_fields = Koha::AdditionalFields->search( { tablename => 'subscription' } ); |
53 |
|
53 |
|
54 |
my $op = $cgi->param('op') || q{}; |
54 |
my $op = $cgi->param('op') || q{}; |
55 |
if ( $op eq 'cud-batchedit' ) { |
55 |
if ( $op eq 'cud-batchedit' ) { |
Lines 66-74
if ( $op eq 'cud-batchedit' ) {
Link Here
|
66 |
$params{'enddate'} = dt_from_string( scalar $cgi->param('enddate') ) if $cgi->param('enddate'); |
66 |
$params{'enddate'} = dt_from_string( scalar $cgi->param('enddate') ) if $cgi->param('enddate'); |
67 |
|
67 |
|
68 |
my $field_values = {}; |
68 |
my $field_values = {}; |
69 |
foreach my $field (@available_additional_fields) { |
69 |
|
70 |
my $value = $cgi->param( 'field_' . $field->id ); |
70 |
while ( my $available_field = $available_additional_fields->next ) { |
71 |
$field_values->{ $field->id } = $value; |
71 |
my @submitted_fields = $cgi->param( 'additional_field_' . $available_field->id ); |
|
|
72 |
|
73 |
my @submitted_fields_array; |
74 |
foreach my $submitted_field (@submitted_fields) { |
75 |
push @submitted_fields_array, $submitted_field if $submitted_field; |
76 |
} |
77 |
$field_values->{ $available_field->id } = \@submitted_fields_array; |
72 |
} |
78 |
} |
73 |
|
79 |
|
74 |
foreach my $subscription (@subscriptions) { |
80 |
foreach my $subscription (@subscriptions) { |
Lines 81-105
if ( $op eq 'cud-batchedit' ) {
Link Here
|
81 |
} |
87 |
} |
82 |
} |
88 |
} |
83 |
|
89 |
|
84 |
my @additional_field_values; |
90 |
$subscription->add_additional_fields($field_values, 'subscription'); |
85 |
foreach my $field (@available_additional_fields) { |
|
|
86 |
my $value = $field_values->{ $field->id }; |
87 |
if ( defined $value and $value ne '' ) { |
88 |
push @additional_field_values, { |
89 |
id => $field->id, |
90 |
value => $value, |
91 |
}; |
92 |
} else { |
93 |
my $existing = $subscription->additional_field_values->search( { field_id => $field->id } )->last; |
94 |
if ( $existing && $existing->value ) { |
95 |
push @additional_field_values, { |
96 |
id => $field->id, |
97 |
value => $existing->value, |
98 |
}; |
99 |
} |
100 |
} |
101 |
} |
102 |
$subscription->set_additional_fields( \@additional_field_values ); |
103 |
|
91 |
|
104 |
$subscription->store; |
92 |
$subscription->store; |
105 |
} |
93 |
} |
Lines 110-119
if ( $op eq 'cud-batchedit' ) {
Link Here
|
110 |
} |
98 |
} |
111 |
|
99 |
|
112 |
$template->param( |
100 |
$template->param( |
113 |
subscriptions => \@subscriptions, |
101 |
subscriptions => \@subscriptions, |
114 |
booksellers => [ Koha::Acquisition::Booksellers->search->as_list ], |
102 |
booksellers => [ Koha::Acquisition::Booksellers->search->as_list ], |
115 |
additional_fields => \@available_additional_fields, |
103 |
available_additional_fields => Koha::AdditionalFields->search( { tablename => 'subscription' } ), |
116 |
referrer => scalar $cgi->param('referrer'), |
104 |
referrer => scalar $cgi->param('referrer'), |
117 |
); |
105 |
); |
118 |
|
106 |
|
119 |
output_html_with_http_headers $cgi, $cookie, $template->output; |
107 |
output_html_with_http_headers $cgi, $cookie, $template->output; |
120 |
- |
|
|