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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-8 / +21 lines)
Lines 97-112 Link Here
97
                </li>
97
                </li>
98
                [% FOR field IN additional_fields_for_subscription %]
98
                [% FOR field IN additional_fields_for_subscription %]
99
                  <li>
99
                  <li>
100
                    <label for="additional_field_[% field.name %]"> [% field.name %]: </label>
100
                    <label for="additional_field_[% field.id %]"> [% field.name %]: </label>
101
                    [% IF field.authorised_value_choices %]
101
                    [% IF field.authorised_value_choices %]
102
                      <select id="additional_field_[% field.name %]" name="additional_field_[% field.name %]_filter">
102
                      <select id="additional_field_[% field.id %]" name="additional_field_[% field.id %]_filter">
103
                        <option value="">All</option>
103
                        <option value="">All</option>
104
                        [% FOREACH av IN field.authorised_value_choices %]
104
                        [% FOREACH av IN field.authorised_value_choices %]
105
                          <option value="[% av.authorised_value %]">[% av.lib %]</option>
105
                          <option value="[% av.authorised_value %]">[% av.lib %]</option>
106
                        [% END %]
106
                        [% END %]
107
                      </select>
107
                      </select>
108
                    [% ELSE %]
108
                    [% ELSE %]
109
                      <input id="additional_field_[% field.name %]" type="text" value="[% additional_fields.${field.name} %]" name="additional_field_[% field.name %]_filter" />
109
                      <input id="additional_field_[% field.id %]" type="text" value="[% additional_fields.${field.name} %]" name="additional_field_[% field.id %]_filter" />
110
                    [% END %]
110
                    [% END %]
111
                  </li>
111
                  </li>
112
                [% END %]
112
                [% END %]
Lines 184-191 Link Here
184
                        <td>
184
                        <td>
185
                          [% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %]
185
                          [% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %]
186
                        </td>
186
                        </td>
187
                        [% IF ( routing && CAN_user_serials_routing ) %]
188
                        [% END %]
189
                        [% FOR field IN additional_fields_for_subscription %]
187
                        [% FOR field IN additional_fields_for_subscription %]
190
                          [% IF field.authorised_value_category %]
188
                          [% IF field.authorised_value_category %]
191
                            <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
189
                            <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
Lines 195-200 Link Here
195
                        [% END %]
193
                        [% END %]
196
                        <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
194
                        <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
197
                        </td>
195
                        </td>
196
                        [% IF ( routing && CAN_user_serials_routing ) %]
198
                        <td>
197
                        <td>
199
                          [% IF ( subscription.cannotedit ) %]
198
                          [% IF ( subscription.cannotedit ) %]
200
                            &nbsp;
199
                            &nbsp;
Lines 207-212 Link Here
207
                            [% END %]
206
                            [% END %]
208
                          [% END %]
207
                          [% END %]
209
                        </td>
208
                        </td>
209
                        [% END %]
210
                        <td>
210
                        <td>
211
                        [% IF ( subscription.cannotedit ) %]
211
                        [% IF ( subscription.cannotedit ) %]
212
                          &nbsp;
212
                          &nbsp;
Lines 235-240 Link Here
235
                        <th> Notes </th>
235
                        <th> Notes </th>
236
                        <th>Library</th>
236
                        <th>Library</th>
237
                        <th>Call number</th>
237
                        <th>Call number</th>
238
                        [% FOR field IN additional_fields_for_subscription %]
239
                          <th>[% field.name %]</th>
240
                        [% END %]
238
                        <th>&nbsp;</th>
241
                        <th>&nbsp;</th>
239
                        <th>&nbsp;</th>
242
                        <th>&nbsp;</th>
240
                    </tr>
243
                    </tr>
Lines 246-251 Link Here
246
                      <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
249
                      <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
247
                      <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
250
                      <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
248
                      <td><input type="text" class="filter" data-column_num="4" placeholder="Search callnumber" /></td>
251
                      <td><input type="text" class="filter" data-column_num="4" placeholder="Search callnumber" /></td>
252
                      [% FOR field IN additional_fields_for_subscription %]
253
                        <td><input type="text" class="filter" data-column_num="[% loop.count + 4 %]" placeholder="Search [% field.name %]" /></td>
254
                      [% END %]
249
                      <td></td>
255
                      <td></td>
250
                      <td></td>
256
                      <td></td>
251
                    </tr>
257
                    </tr>
Lines 271-276 Link Here
271
                        <td>
277
                        <td>
272
                          [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
278
                          [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
273
                        </td>
279
                        </td>
280
                        [% FOR field IN additional_fields_for_subscription %]
281
                          [% IF field.authorised_value_category %]
282
                            <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
283
                          [% ELSE %]
284
                            <td>[% subscription.additional_fields.${field.name} %]</td>
285
                          [% END %]
286
                        [% END %]
274
                        <td>
287
                        <td>
275
                          [% UNLESS subscription.cannotedit %]
288
                          [% UNLESS subscription.cannotedit %]
276
                            <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>
289
                            <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 346-354 Link Here
346
                </li>
359
                </li>
347
                [% FOR field IN additional_fields_for_subscription %]
360
                [% FOR field IN additional_fields_for_subscription %]
348
                  <li>
361
                  <li>
349
                    <label for="additional_field_[% field.name %]"> [% field.name %]: </label>
362
                    <label for="additional_field_[% field.id %]ID"> [% field.name %]: </label>
350
                    [% IF field.authorised_value_choices %]
363
                    [% IF field.authorised_value_choices %]
351
                      <select id="additional_field_[% field.name %]" name="additional_field_[% field.name %]_filter">
364
                      <select id="additional_field_[% field.id %]" name="additional_field_[% field.id %]_filter">
352
                        <option value="">All</option>
365
                        <option value="">All</option>
353
                        [% FOREACH av IN field.authorised_value_choices %]
366
                        [% FOREACH av IN field.authorised_value_choices %]
354
                          [% IF av.authorised_value == additional_field_filters.${field.name} %]
367
                          [% IF av.authorised_value == additional_field_filters.${field.name} %]
Lines 359-365 Link Here
359
                        [% END %]
372
                        [% END %]
360
                      </select>
373
                      </select>
361
                    [% ELSE %]
374
                    [% ELSE %]
362
                      <input id="additional_field_[% field.name %]" type="text" value="[% additional_field_filters.${field.name} %]" name="additional_field_[% field.name %]_filter" />
375
                      <input id="additional_field_[% field.id %]" type="text" value="[% additional_field_filters.${field.name} %]" name="additional_field_[% field.id %]_filter" />
363
                    [% END %]
376
                    [% END %]
364
                  </li>
377
                  </li>
365
                [% END %]
378
                [% END %]
(-)a/serials/serials-search.pl (-2 / +1 lines)
Lines 76-82 if ( $op and $op eq "close" ) { Link Here
76
my $additional_fields = Koha::AdditionalField->all( { table => 'subscription', searchable => 1 } );
76
my $additional_fields = Koha::AdditionalField->all( { table => '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
    if ( my $filter_value = $query->param('additional_field_' . $field->{id} . '_filter') ) {
80
        $additional_field_filters->{ $field->{name} } = $filter_value;
80
        $additional_field_filters->{ $field->{name} } = $filter_value;
81
    }
81
    }
82
    if ( $field->{authorised_value_category} ) {
82
    if ( $field->{authorised_value_category} ) {
83
- 

Return to bug 10855