View | Details | Raw Unified | Return to bug 10855
Collapse All | Expand All

(-)a/C4/Serials.pm (-2 / +3 lines)
Lines 655-662 sub SearchSubscriptions { Link Here
655
    my $matching_record_ids_for_additional_fields = [];
655
    my $matching_record_ids_for_additional_fields = [];
656
    if ( @$additional_fields ) {
656
    if ( @$additional_fields ) {
657
        $matching_record_ids_for_additional_fields = Koha::AdditionalField->get_matching_record_ids({
657
        $matching_record_ids_for_additional_fields = Koha::AdditionalField->get_matching_record_ids({
658
                fields => $args->{additional_fields},
658
                fields => $additional_fields,
659
                tablename => 'subscription',
659
                tablename => 'subscription',
660
                exact_match => 0,
660
        });
661
        });
661
        return () unless @$matching_record_ids_for_additional_fields;
662
        return () unless @$matching_record_ids_for_additional_fields;
662
    }
663
    }
Lines 746-752 sub SearchSubscriptions { Link Here
746
            record_id => $subscription->{subscriptionid},
747
            record_id => $subscription->{subscriptionid},
747
            tablename => 'subscription'
748
            tablename => 'subscription'
748
        });
749
        });
749
        $subscription->{addition_fields} = $additional_field_values->{$subscription->{subscriptionid}};
750
        $subscription->{additional_fields} = $additional_field_values->{$subscription->{subscriptionid}};
750
    }
751
    }
751
752
752
    return @$results;
753
    return @$results;
(-)a/Koha/AdditionalField.pm (-5 / +7 lines)
Lines 97-102 sub insert_values { Link Here
97
    my $dbh = C4::Context->dbh;
97
    my $dbh = C4::Context->dbh;
98
    local $dbh->{RaiseError} = 1;
98
    local $dbh->{RaiseError} = 1;
99
    while ( my ( $record_id, $value ) = each %{$self->{values}} ) {
99
    while ( my ( $record_id, $value ) = each %{$self->{values}} ) {
100
        next unless defined $value;
100
        my $updated = $dbh->do(q|
101
        my $updated = $dbh->do(q|
101
            UPDATE additional_field_values
102
            UPDATE additional_field_values
102
            SET value = ?
103
            SET value = ?
Lines 135-141 sub fetch_values { Link Here
135
136
136
sub all {
137
sub all {
137
    my ( $class, $args ) = @_;
138
    my ( $class, $args ) = @_;
138
    die "BAD CALL: Don't use fetch_all_values as a static method"
139
    die "BAD CALL: Don't use fetch_all_values as an instance method"
139
        if ref $class and UNIVERSAL::can($class,'can');
140
        if ref $class and UNIVERSAL::can($class,'can');
140
    my $tablename = $args->{tablename};
141
    my $tablename = $args->{tablename};
141
    my $searchable = $args->{searchable};
142
    my $searchable = $args->{searchable};
Lines 172-178 sub all { Link Here
172
173
173
sub fetch_all_values {
174
sub fetch_all_values {
174
    my ( $class, $args ) = @_;
175
    my ( $class, $args ) = @_;
175
    die "BAD CALL: Don't use fetch_all_values as a static method"
176
    die "BAD CALL: Don't use fetch_all_values as an instance method"
176
        if ref $class and UNIVERSAL::can($class,'can');
177
        if ref $class and UNIVERSAL::can($class,'can');
177
178
178
    my $record_id = $args->{record_id};
179
    my $record_id = $args->{record_id};
Lines 199-209 sub fetch_all_values { Link Here
199
200
200
sub get_matching_record_ids {
201
sub get_matching_record_ids {
201
    my ( $class, $args ) = @_;
202
    my ( $class, $args ) = @_;
202
    die "BAD CALL: Don't use fetch_all_values as a static method"
203
    die "BAD CALL: Don't use fetch_all_values as an instance method"
203
        if ref $class and UNIVERSAL::can($class,'can');
204
        if ref $class and UNIVERSAL::can($class,'can');
204
205
205
    my $fields = $args->{fields} // [];
206
    my $fields = $args->{fields} // [];
206
    my $tablename = $args->{tablename};
207
    my $tablename = $args->{tablename};
208
    my $exact_match = $args->{exact_match} // 1;
207
    return [] unless @$fields;
209
    return [] unless @$fields;
208
210
209
    my $dbh = C4::Context->dbh;
211
    my $dbh = C4::Context->dbh;
Lines 222-234 sub get_matching_record_ids { Link Here
222
                    WHERE afv.field_id = af.id
224
                    WHERE afv.field_id = af.id
223
                    AND af.name = ?
225
                    AND af.name = ?
224
                    AND af.tablename = ?
226
                    AND af.tablename = ?
225
                    AND value = ?
227
                    AND value LIKE ?
226
                ) AS field$i USING (id)
228
                ) AS field$i USING (id)
227
            WHERE field$i.id IS NOT NULL
229
            WHERE field$i.id IS NOT NULL
228
        ) AS values$i |;
230
        ) AS values$i |;
229
        $subquery .= ' USING (record_id)' if $i > 1;
231
        $subquery .= ' USING (record_id)' if $i > 1;
230
        push @subqueries, $subquery;
232
        push @subqueries, $subquery;
231
        push @args, $field->{name}, $tablename, $field->{value};
233
        push @args, $field->{name}, $tablename, ( $exact_match ? $field->{value} : "%$field->{value}%" );
232
    }
234
    }
233
    $query .= join( ' LEFT JOIN ', @subqueries ) . ' WHERE 1';
235
    $query .= join( ' LEFT JOIN ', @subqueries ) . ' WHERE 1';
234
    for my $j ( 1 .. $i ) {
236
    for my $j ( 1 .. $i ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt (-1 lines)
Lines 17-23 Link Here
17
    </div>
17
    </div>
18
  </div>
18
  </div>
19
  <div class="yui-b">
19
  <div class="yui-b">
20
    [% INCLUDE 'subscriptions-search.inc' %]
21
    [% INCLUDE 'serials-menu.inc' %]
20
    [% INCLUDE 'serials-menu.inc' %]
22
  </div>
21
  </div>
23
</div>
22
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-8 / +21 lines)
Lines 98-113 Link Here
98
                </li>
98
                </li>
99
                [% FOR field IN additional_fields_for_subscription %]
99
                [% FOR field IN additional_fields_for_subscription %]
100
                  <li>
100
                  <li>
101
                    <label for="additional_field_[% field.name %]"> [% field.name %]: </label>
101
                    <label for="additional_field_[% field.id %]"> [% field.name %]: </label>
102
                    [% IF field.authorised_value_choices %]
102
                    [% IF field.authorised_value_choices %]
103
                      <select id="additional_field_[% field.name %]" name="additional_field_[% field.name %]_filter">
103
                      <select id="additional_field_[% field.id %]" name="additional_field_[% field.id %]_filter">
104
                        <option value="">All</option>
104
                        <option value="">All</option>
105
                        [% FOREACH av IN field.authorised_value_choices %]
105
                        [% FOREACH av IN field.authorised_value_choices %]
106
                          <option value="[% av.authorised_value %]">[% av.lib %]</option>
106
                          <option value="[% av.authorised_value %]">[% av.lib %]</option>
107
                        [% END %]
107
                        [% END %]
108
                      </select>
108
                      </select>
109
                    [% ELSE %]
109
                    [% ELSE %]
110
                      <input id="additional_field_[% field.name %]" type="text" value="[% additional_fields.${field.name} %]" name="additional_field_[% field.name %]_filter" />
110
                      <input id="additional_field_[% field.id %]" type="text" value="[% additional_fields.${field.name} %]" name="additional_field_[% field.id %]_filter" />
111
                    [% END %]
111
                    [% END %]
112
                  </li>
112
                  </li>
113
                [% END %]
113
                [% END %]
Lines 186-193 Link Here
186
                        <td>
186
                        <td>
187
                          [% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %]
187
                          [% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %]
188
                        </td>
188
                        </td>
189
                        [% IF ( routing && CAN_user_serials_routing ) %]
190
                        [% END %]
191
                        [% FOR field IN additional_fields_for_subscription %]
189
                        [% FOR field IN additional_fields_for_subscription %]
192
                          [% IF field.authorised_value_category %]
190
                          [% IF field.authorised_value_category %]
193
                            <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
191
                            <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
Lines 197-202 Link Here
197
                        [% END %]
195
                        [% END %]
198
                        <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
196
                        <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
199
                        </td>
197
                        </td>
198
                        [% IF ( routing && CAN_user_serials_routing ) %]
200
                        <td>
199
                        <td>
201
                          [% IF ( subscription.cannotedit ) %]
200
                          [% IF ( subscription.cannotedit ) %]
202
                            &nbsp;
201
                            &nbsp;
Lines 209-214 Link Here
209
                            [% END %]
208
                            [% END %]
210
                          [% END %]
209
                          [% END %]
211
                        </td>
210
                        </td>
211
                        [% END %]
212
                        <td>
212
                        <td>
213
                        [% IF ( CAN_user_serials_receive_serials ) %]
213
                        [% IF ( CAN_user_serials_receive_serials ) %]
214
                          <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7">Serial receive</a>
214
                          <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7">Serial receive</a>
Lines 236-241 Link Here
236
                        <th> Notes </th>
236
                        <th> Notes </th>
237
                        <th>Library</th>
237
                        <th>Library</th>
238
                        <th>Call number</th>
238
                        <th>Call number</th>
239
                        [% FOR field IN additional_fields_for_subscription %]
240
                          <th>[% field.name %]</th>
241
                        [% END %]
239
                        <th>&nbsp;</th>
242
                        <th>&nbsp;</th>
240
                        <th>&nbsp;</th>
243
                        <th>&nbsp;</th>
241
                    </tr>
244
                    </tr>
Lines 247-252 Link Here
247
                      <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
250
                      <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
248
                      <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
251
                      <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
249
                      <td><input type="text" class="filter" data-column_num="4" placeholder="Search callnumber" /></td>
252
                      <td><input type="text" class="filter" data-column_num="4" placeholder="Search callnumber" /></td>
253
                      [% FOR field IN additional_fields_for_subscription %]
254
                        <td><input type="text" class="filter" data-column_num="[% loop.count + 4 %]" placeholder="Search [% field.name %]" /></td>
255
                      [% END %]
250
                      <td></td>
256
                      <td></td>
251
                      <td></td>
257
                      <td></td>
252
                    </tr>
258
                    </tr>
Lines 273-278 Link Here
273
                        <td>
279
                        <td>
274
                          [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
280
                          [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
275
                        </td>
281
                        </td>
282
                        [% FOR field IN additional_fields_for_subscription %]
283
                          [% IF field.authorised_value_category %]
284
                            <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
285
                          [% ELSE %]
286
                            <td>[% subscription.additional_fields.${field.name} %]</td>
287
                          [% END %]
288
                        [% END %]
276
                        <td>
289
                        <td>
277
                          [% UNLESS subscription.cannotedit %]
290
                          [% UNLESS subscription.cannotedit %]
278
                            <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=reopen&amp;routing=[% subscription.routing %]&amp;searched=1&amp;title_filter=[% title_filter %]&amp;ISSN_filter=[% ISSN_filter %]&amp;EAN_filter=[% EAN_filter %]&amp;published_filter=[% publisher_filter %]&amp;bookseller_filter=[% bookseller_filter %]&amp;branch_filter=[% branch_filter %]" id="reopensub">Reopen</a>
291
                            <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=reopen&amp;routing=[% subscription.routing %]&amp;searched=1&amp;title_filter=[% title_filter %]&amp;ISSN_filter=[% ISSN_filter %]&amp;EAN_filter=[% EAN_filter %]&amp;published_filter=[% publisher_filter %]&amp;bookseller_filter=[% bookseller_filter %]&amp;branch_filter=[% branch_filter %]" id="reopensub">Reopen</a>
Lines 349-357 Link Here
349
                </li>
362
                </li>
350
                [% FOR field IN additional_fields_for_subscription %]
363
                [% FOR field IN additional_fields_for_subscription %]
351
                  <li>
364
                  <li>
352
                    <label for="additional_field_[% field.name %]"> [% field.name %]: </label>
365
                    <label for="additional_field_[% field.id %]ID"> [% field.name %]: </label>
353
                    [% IF field.authorised_value_choices %]
366
                    [% IF field.authorised_value_choices %]
354
                      <select id="additional_field_[% field.name %]" name="additional_field_[% field.name %]_filter">
367
                      <select id="additional_field_[% field.id %]" name="additional_field_[% field.id %]_filter">
355
                        <option value="">All</option>
368
                        <option value="">All</option>
356
                        [% FOREACH av IN field.authorised_value_choices %]
369
                        [% FOREACH av IN field.authorised_value_choices %]
357
                          [% IF av.authorised_value == additional_field_filters.${field.name} %]
370
                          [% IF av.authorised_value == additional_field_filters.${field.name} %]
Lines 362-368 Link Here
362
                        [% END %]
375
                        [% END %]
363
                      </select>
376
                      </select>
364
                    [% ELSE %]
377
                    [% ELSE %]
365
                      <input id="additional_field_[% field.name %]" type="text" value="[% additional_field_filters.${field.name} %]" name="additional_field_[% field.name %]_filter" />
378
                      <input id="additional_field_[% field.id %]" type="text" value="[% additional_field_filters.${field.name} %]" name="additional_field_[% field.id %]_filter" />
366
                    [% END %]
379
                    [% END %]
367
                  </li>
380
                  </li>
368
                [% END %]
381
                [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-4 / +4 lines)
Lines 841-849 $(document).ready(function() { Link Here
841
                                  <ol>
841
                                  <ol>
842
                                    [% FOR field IN additional_fields_for_subscription %]
842
                                    [% FOR field IN additional_fields_for_subscription %]
843
                                      <li>
843
                                      <li>
844
                                        <label for="additional_fields_[% field.name %]"> [% field.name %]: </label>
844
                                        <label for="additional_field_[% field.id %]"> [% field.name %]: </label>
845
                                        [% IF field.authorised_value_choices %]
845
                                        [% IF field.authorised_value_choices %]
846
                                          <select name="additional_fields_[% field.name %]">
846
                                          <select name="additional_field_[% field.id %]" id="additional_field_[% field.id %]">
847
                                            [% FOREACH av IN field.authorised_value_choices %]
847
                                            [% FOREACH av IN field.authorised_value_choices %]
848
                                              [% IF av.authorised_value == additional_fields.${field.name} %]
848
                                              [% IF av.authorised_value == additional_fields.${field.name} %]
849
                                                <option value="[% av.authorised_value %]" selected="selected">[% av.lib %]</option>
849
                                                <option value="[% av.authorised_value %]" selected="selected">[% av.lib %]</option>
Lines 854-863 $(document).ready(function() { Link Here
854
                                          </select> (Authorised values for [% field.authorised_value_category %])
854
                                          </select> (Authorised values for [% field.authorised_value_category %])
855
                                        [% ELSE %]
855
                                        [% ELSE %]
856
                                          [% IF field.marcfield %]
856
                                          [% IF field.marcfield %]
857
                                            <input type="text" value="[% additional_fields.${field.name} %]" name="additional_fields_[% field.name %]" readonly="readonly" />
857
                                            <input type="text" value="[% additional_fields.${field.name} %]" id="additional_field_[% field.id %]" name="additional_field_[% field.id %]" readonly="readonly" />
858
                                            This value will be filled with the [% field.marcfield %] subfield of the selected biblio.
858
                                            This value will be filled with the [% field.marcfield %] subfield of the selected biblio.
859
                                          [% ELSE %]
859
                                          [% ELSE %]
860
                                            <input type="text" value="[% additional_fields.${field.name} %]" name="additional_fields_[% field.name %]" />
860
                                            <input type="text" value="[% additional_fields.${field.name} %]" id="additional_field_[% field.id %]" name="additional_field_[% field.id %]" />
861
                                          [% END %]
861
                                          [% END %]
862
                                        [% END %]
862
                                        [% END %]
863
                                      </li>
863
                                      </li>
(-)a/serials/claims.pl (-1 / +1 lines)
Lines 60-66 for my $s (@{$supplierlist} ) { Link Here
60
    }
60
    }
61
}
61
}
62
62
63
my $additional_fields = Koha::AdditionalField->all( { table => 'subscription', searchable => 1 } );
63
my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription', searchable => 1 } );
64
for my $field ( @$additional_fields ) {
64
for my $field ( @$additional_fields ) {
65
    if ( $field->{authorised_value_category} ) {
65
    if ( $field->{authorised_value_category} ) {
66
        $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
66
        $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
(-)a/serials/serials-search.pl (-2 / +3 lines)
Lines 73-82 if ( $op and $op eq "close" ) { Link Here
73
}
73
}
74
74
75
75
76
my $additional_fields = Koha::AdditionalField->all( { table => 'subscription', searchable => 1 } );
76
my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription', searchable => 1 } );
77
my $additional_field_filters;
77
my $additional_field_filters;
78
for my $field ( @$additional_fields ) {
78
for my $field ( @$additional_fields ) {
79
    if ( my $filter_value = $query->param('additional_field_' . $field->{name} . '_filter') ) {
79
    my $filter_value = $query->param('additional_field_' . $field->{id} . '_filter');
80
    if ( defined ( $filter_value ) ) {
80
        $additional_field_filters->{ $field->{name} } = $filter_value;
81
        $additional_field_filters->{ $field->{name} } = $filter_value;
81
    }
82
    }
82
    if ( $field->{authorised_value_category} ) {
83
    if ( $field->{authorised_value_category} ) {
(-)a/serials/subscription-add.pl (-6 / +6 lines)
Lines 155-161 $template->param(branchloop => $branchloop, Link Here
155
);
155
);
156
156
157
157
158
my $additional_fields = Koha::AdditionalField->all( { table => 'subscription' } );
158
my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
159
for my $field ( @$additional_fields ) {
159
for my $field ( @$additional_fields ) {
160
    if ( $field->{authorised_value_category} ) {
160
    if ( $field->{authorised_value_category} ) {
161
        $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
161
        $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
Lines 349-361 sub redirect_add_subscription { Link Here
349
        $skip_serialseq
349
        $skip_serialseq
350
    );
350
    );
351
351
352
    my $additional_fields = Koha::AdditionalField->all( { table => 'subscription' } );
352
    my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
353
    my @additional_field_values;
353
    my @additional_field_values;
354
    for my $field ( @$additional_fields ) {
354
    for my $field ( @$additional_fields ) {
355
        my $af = Koha::AdditionalField->new({ id => $field->{id} });
355
        my $af = Koha::AdditionalField->new({ id => $field->{id} });
356
        $af->{values} = {
356
        $af->{values} = {
357
            $subscriptionid => $query->param('additional_fields_' . $field->{name})
357
            $subscriptionid => $query->param('additional_field_' . $field->{id})
358
        };
358
        } if defined $query->param('additional_field_' . $field->{id});
359
        $af->insert_values;
359
        $af->insert_values;
360
    }
360
    }
361
361
Lines 434-440 sub redirect_mod_subscription { Link Here
434
        $skip_serialseq
434
        $skip_serialseq
435
    );
435
    );
436
436
437
    my $additional_fields = Koha::AdditionalField->all( { table => 'subscription' } );
437
    my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription' } );
438
    my @additional_field_values;
438
    my @additional_field_values;
439
    for my $field ( @$additional_fields ) {
439
    for my $field ( @$additional_fields ) {
440
        my $af = Koha::AdditionalField->new({ id => $field->{id} })->fetch;
440
        my $af = Koha::AdditionalField->new({ id => $field->{id} })->fetch;
Lines 448-454 sub redirect_mod_subscription { Link Here
448
            };
448
            };
449
        } else {
449
        } else {
450
            $af->{values} = {
450
            $af->{values} = {
451
                $subscriptionid => $query->param('additional_fields_' . $field->{name})
451
                $subscriptionid => $query->param('additional_field_' . $field->{id})
452
            };
452
            };
453
        }
453
        }
454
        $af->insert_values;
454
        $af->insert_values;
(-)a/t/db_dependent/AdditionalField.t (-15 / +37 lines)
Lines 1-7 Link Here
1
#!/usr/bin/perl
1
#!/usr/bin/perl
2
2
3
use Modern::Perl;
3
use Modern::Perl;
4
use Test::More tests => 34;
4
use Test::More tests => 37;
5
5
6
use C4::Context;
6
use C4::Context;
7
use Koha::AdditionalField;
7
use Koha::AdditionalField;
Lines 104-109 use C4::Acquisition; Link Here
104
use C4::Biblio;
104
use C4::Biblio;
105
use C4::Budgets;
105
use C4::Budgets;
106
use C4::Serials;
106
use C4::Serials;
107
use C4::Serials::Frequency;
108
use C4::Serials::Numberpattern;
107
109
108
my $booksellerid = C4::Bookseller::AddBookseller(
110
my $booksellerid = C4::Bookseller::AddBookseller(
109
    {
111
    {
Lines 118-124 my ($biblionumber, $biblioitemnumber) = AddBiblio(MARC::Record->new, ''); Link Here
118
my $budgetid;
120
my $budgetid;
119
my $bpid = AddBudgetPeriod({
121
my $bpid = AddBudgetPeriod({
120
    budget_period_startdate => '01-01-2015',
122
    budget_period_startdate => '01-01-2015',
121
    budget_period_enddate   => '12-31-2015',
123
    budget_period_enddate   => '01-01-2016',
122
    budget_description      => "budget desc"
124
    budget_description      => "budget desc"
123
});
125
});
124
126
Lines 132-153 my $budget_id = AddBudget({ Link Here
132
    budget_period_id   => $bpid
134
    budget_period_id   => $bpid
133
});
135
});
134
136
137
my $frequency_id = AddSubscriptionFrequency({ description => "Test frequency 1" });
138
my $pattern_id = AddSubscriptionNumberpattern({
139
    label => 'Test numberpattern 1',
140
    numberingmethod => '{X}'
141
});
142
135
my $subscriptionid1 = NewSubscription(
143
my $subscriptionid1 = NewSubscription(
136
    undef,      "",     undef, undef, $budget_id, $biblionumber, '01-01-2013',undef,
144
    undef,      "",     undef, undef, $budget_id, $biblionumber,
137
    undef,      undef,  undef, undef, undef,      undef,         undef,  undef,
145
    '2013-01-01', $frequency_id, undef, undef,  undef,
138
    undef,      undef,  undef, undef, undef,      undef,         undef,  undef,
146
    undef,      undef,  undef, undef, undef, undef,
139
    undef,      undef,  undef, undef, undef,      undef,         undef,  1,
147
    1,          "notes",undef, '2013-01-01', undef, $pattern_id,
140
    "notes",    undef,  undef, undef, undef,      undef,         undef,  0,
148
    undef,       undef,  0,    "intnotes",  0,
141
    "intnotes", 0,      undef, undef, 0,          undef,         '31-12-2013',
149
    undef, undef, 0,          undef,         '2013-01-01', 0
142
);
150
);
143
151
144
my $subscriptionid2 = NewSubscription(
152
my $subscriptionid2 = NewSubscription(
145
    undef,      "",     undef, undef, $budget_id, $biblionumber, '01-01-2013',undef,
153
    undef,      "",     undef, undef, $budget_id, $biblionumber,
146
    undef,      undef,  undef, undef, undef,      undef,         undef,  undef,
154
    '2013-01-01', $frequency_id, undef, undef,  undef,
147
    undef,      undef,  undef, undef, undef,      undef,         undef,  undef,
155
    undef,      undef,  undef, undef, undef, undef,
148
    undef,      undef,  undef, undef, undef,      undef,         undef,  1,
156
    1,          "notes",undef, '2013-01-01', undef, $pattern_id,
149
    "notes",    undef,  undef, undef, undef,      undef,         undef,  0,
157
    undef,       undef,  0,    "intnotes",  0,
150
    "intnotes", 0,      undef, undef, 0,          undef,         '31-12-2013',
158
    undef, undef, 0,          undef,         '2013-01-01', 0
151
);
159
);
152
160
153
# insert
161
# insert
Lines 268-271 is ( $exists, 1, "get_matching_record_ids: field common: common_value matches su Link Here
268
$exists = grep /not_existent_id/, @$matching_record_ids;
276
$exists = grep /not_existent_id/, @$matching_record_ids;
269
is ( $exists, 0, "get_matching_record_ids: field common: common_value does not inexistent id" );
277
is ( $exists, 0, "get_matching_record_ids: field common: common_value does not inexistent id" );
270
278
279
$fields = [
280
    {
281
        name => 'common',
282
        value => q|common|,
283
    }
284
];
285
$matching_record_ids = Koha::AdditionalField->get_matching_record_ids({ tablename => 'subscription', fields => $fields, exact_match => 0 });
286
$exists = grep /$subscriptionid1/, @$matching_record_ids;
287
is ( $exists, 1, "get_matching_record_ids: field common: common% matches subscription1" );
288
$exists = grep /$subscriptionid2/, @$matching_record_ids;
289
is ( $exists, 1, "get_matching_record_ids: field common: common% matches subscription2 too" );
290
$exists = grep /not_existent_id/, @$matching_record_ids;
291
is ( $exists, 0, "get_matching_record_ids: field common: common% does not inexistent id" );
292
293
271
$dbh->rollback;
294
$dbh->rollback;
272
- 

Return to bug 10855