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 185-192 Link Here
185
                        <td>
185
                        <td>
186
                          [% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %]
186
                          [% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %]
187
                        </td>
187
                        </td>
188
                        [% IF ( routing && CAN_user_serials_routing ) %]
189
                        [% END %]
190
                        [% FOR field IN additional_fields_for_subscription %]
188
                        [% FOR field IN additional_fields_for_subscription %]
191
                          [% IF field.authorised_value_category %]
189
                          [% IF field.authorised_value_category %]
192
                            <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
190
                            <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
Lines 196-201 Link Here
196
                        [% END %]
194
                        [% END %]
197
                        <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
195
                        <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
198
                        </td>
196
                        </td>
197
                        [% IF ( routing && CAN_user_serials_routing ) %]
199
                        <td>
198
                        <td>
200
                          [% IF ( subscription.cannotedit ) %]
199
                          [% IF ( subscription.cannotedit ) %]
201
                            &nbsp;
200
                            &nbsp;
Lines 208-213 Link Here
208
                            [% END %]
207
                            [% END %]
209
                          [% END %]
208
                          [% END %]
210
                        </td>
209
                        </td>
210
                        [% END %]
211
                        <td>
211
                        <td>
212
                        [% IF ( CAN_user_serials_receive_serials ) %]
212
                        [% IF ( CAN_user_serials_receive_serials ) %]
213
                          <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7">Serial receive</a>
213
                          <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7">Serial receive</a>
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 272-277 Link Here
272
                        <td>
278
                        <td>
273
                          [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
279
                          [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
274
                        </td>
280
                        </td>
281
                        [% FOR field IN additional_fields_for_subscription %]
282
                          [% IF field.authorised_value_category %]
283
                            <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
284
                          [% ELSE %]
285
                            <td>[% subscription.additional_fields.${field.name} %]</td>
286
                          [% END %]
287
                        [% END %]
275
                        <td>
288
                        <td>
276
                          [% UNLESS subscription.cannotedit %]
289
                          [% UNLESS subscription.cannotedit %]
277
                            <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>
290
                            <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 348-356 Link Here
348
                </li>
361
                </li>
349
                [% FOR field IN additional_fields_for_subscription %]
362
                [% FOR field IN additional_fields_for_subscription %]
350
                  <li>
363
                  <li>
351
                    <label for="additional_field_[% field.name %]"> [% field.name %]: </label>
364
                    <label for="additional_field_[% field.id %]ID"> [% field.name %]: </label>
352
                    [% IF field.authorised_value_choices %]
365
                    [% IF field.authorised_value_choices %]
353
                      <select id="additional_field_[% field.name %]" name="additional_field_[% field.name %]_filter">
366
                      <select id="additional_field_[% field.id %]" name="additional_field_[% field.id %]_filter">
354
                        <option value="">All</option>
367
                        <option value="">All</option>
355
                        [% FOREACH av IN field.authorised_value_choices %]
368
                        [% FOREACH av IN field.authorised_value_choices %]
356
                          [% IF av.authorised_value == additional_field_filters.${field.name} %]
369
                          [% IF av.authorised_value == additional_field_filters.${field.name} %]
Lines 361-367 Link Here
361
                        [% END %]
374
                        [% END %]
362
                      </select>
375
                      </select>
363
                    [% ELSE %]
376
                    [% ELSE %]
364
                      <input id="additional_field_[% field.name %]" type="text" value="[% additional_field_filters.${field.name} %]" name="additional_field_[% field.name %]_filter" />
377
                      <input id="additional_field_[% field.id %]" type="text" value="[% additional_field_filters.${field.name} %]" name="additional_field_[% field.id %]_filter" />
365
                    [% END %]
378
                    [% END %]
366
                  </li>
379
                  </li>
367
                [% END %]
380
                [% 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