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

(-)a/cataloguing/addbiblio.pl (+1 lines)
Lines 227-232 sub build_authorized_values_list { Link Here
227
        name     => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
227
        name     => "tag_".$tag."_subfield_".$subfield."_".$index_tag."_".$index_subfield,
228
        default  => $value,
228
        default  => $value,
229
        values   => \@authorised_values,
229
        values   => \@authorised_values,
230
        not_in_av => ( ( grep { $_ eq $value } @authorised_values ) ? 0 : 1 ),
230
        labels   => \%authorised_lib,
231
        labels   => \%authorised_lib,
231
        ( ( grep { $_ eq $category } ( qw(branches itemtypes cn_source) ) ) ? () : ( category => $category ) ),
232
        ( ( grep { $_ eq $category } ( qw(branches itemtypes cn_source) ) ) ? () : ( category => $category ) ),
232
    };
233
    };
(-)a/cataloguing/additem.pl (+2 lines)
Lines 231-236 sub generate_subfield_form { Link Here
231
                    id          => $subfield_data{id},
231
                    id          => $subfield_data{id},
232
                    maxlength   => $subfield_data{maxlength},
232
                    maxlength   => $subfield_data{maxlength},
233
                    value       => $value,
233
                    value       => $value,
234
                    not_in_av => ( ( grep { $_ eq $value } @authorised_values ) ? 0 : 1 ),
234
                    ( ( grep { $_ eq $subfieldlib->{authorised_value}} ( qw(branches itemtypes cn_source) ) ) ? () : ( category => $subfieldlib->{authorised_value}) ),
235
                    ( ( grep { $_ eq $subfieldlib->{authorised_value}} ( qw(branches itemtypes cn_source) ) ) ? () : ( category => $subfieldlib->{authorised_value}) ),
235
                };
236
                };
236
            }
237
            }
Lines 241-246 sub generate_subfield_form { Link Here
241
                    values   => \@authorised_values,
242
                    values   => \@authorised_values,
242
                    labels   => \%authorised_lib,
243
                    labels   => \%authorised_lib,
243
                    default  => $value,
244
                    default  => $value,
245
                    not_in_av => ( ( grep { $_ eq $value } @authorised_values ) ? 0 : 1 ),
244
                    ( ( grep { $_ eq $subfieldlib->{authorised_value}} ( qw(branches itemtypes cn_source) ) ) ? () : ( category => $subfieldlib->{authorised_value}) ),
246
                    ( ( grep { $_ eq $subfieldlib->{authorised_value}} ( qw(branches itemtypes cn_source) ) ) ? () : ( category => $subfieldlib->{authorised_value}) ),
245
                };
247
                };
246
            }
248
            }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-1 / +4 lines)
Lines 843-849 Link Here
843
                                                [% ELSIF ( mv.type == 'textarea' ) %]
843
                                                [% ELSIF ( mv.type == 'textarea' ) %]
844
                                                    <textarea cols="70" rows="4" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" class="input_marceditor" tabindex="1">[%- mv.value | html -%]</textarea>
844
                                                    <textarea cols="70" rows="4" id="[%- mv.id | html -%]" name="[%- mv.name | html -%]" class="input_marceditor" tabindex="1">[%- mv.value | html -%]</textarea>
845
                                                [% ELSIF ( mv.type == 'select' ) %]
845
                                                [% ELSIF ( mv.type == 'select' ) %]
846
                                                    <select name="[%- mv.name | html -%]" tabindex="1" size="1" class="input_marceditor" id="[%- mv.id | html -%]" data-category="[% mv.category | html %]">
846
                                                    <select name="[%- mv.name | html -%]" tabindex="1" size="1" class="input_marceditor" id="[%- mv.id | html -%]" data-category="[% mv.category | html %]" data-not_av="[% mv.not_in_av %]">
847
                                                    [% IF mv.not_in_av %]
848
                                                        <option value="[% mv.default %]">[% mv.default %]</option>
849
                                                    [% END %]
847
                                                    [% FOREACH aval IN mv.values %]
850
                                                    [% FOREACH aval IN mv.values %]
848
                                                        [% IF aval == mv.default %]
851
                                                        [% IF aval == mv.default %]
849
                                                        <option value="[%- aval | html -%]" selected="selected">[%- mv.labels.$aval | html -%]</option>
852
                                                        <option value="[%- aval | html -%]" selected="selected">[%- mv.labels.$aval | html -%]</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt (-2 / +6 lines)
Lines 151-159 Link Here
151
                    <input type="hidden" id="[%- mv.id | html -%]" name="field_value" class="input_marceditor" size="50" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]">
151
                    <input type="hidden" id="[%- mv.id | html -%]" name="field_value" class="input_marceditor" size="50" maxlength="[%- mv.maxlength | html -%]" value="[%- mv.value | html -%]">
152
                [% ELSIF ( mv.type == 'select' ) %]
152
                [% ELSIF ( mv.type == 'select' ) %]
153
                    [% IF ( mv.readonly ) %]
153
                    [% IF ( mv.readonly ) %]
154
                        <select name="field_value" id="[%- mv.id | html -%]" size="1" class="input_marceditor" readonly="readonly" disabled="disabled">
154
                        <select name="field_value" id="[%- mv.id | html -%]" size="1" class="input_marceditor" readonly="readonly" disabled="disabled" >
155
                    [% ELSE %]
155
                    [% ELSE %]
156
                        <select name="field_value" id="[%- mv.id | html -%]" size="1" class="input_marceditor" data-category="[% mv.category | html %]">
156
                        <select name="field_value" id="[%- mv.id | html -%]" size="1" class="input_marceditor" data-category="[% mv.category | html %]" data-not_av="[% mv.not_in_av %]">
157
                    [% END %]
158
159
                    [% IF mv.not_in_av %]
160
                        <option value="[% mv.default %]">[% mv.default %]</option>
157
                    [% END %]
161
                    [% END %]
158
                    [% FOREACH aval IN mv.values %]
162
                    [% FOREACH aval IN mv.values %]
159
                        [% IF aval == mv.default %]
163
                        [% IF aval == mv.default %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/cataloging.js (-1 / +9 lines)
Lines 576-579 $(document).ready(function() { Link Here
576
        });
576
        });
577
        return false;
577
        return false;
578
    });
578
    });
579
580
    var tooltip_msg = _("The selected value is not in the list of authorised values!");
581
    $("select[data-not_av='1']").each(function(){
582
        var li = $(this).parent();
583
        var tooltip = $('<i id="info_digests" data-toggle="tooltip" title="'+tooltip_msg+'" data-placement="right" class="fa fa-warning warn"></i>');
584
        $(tooltip).tooltip();
585
        $(li).append(tooltip);
586
    });
587
579
});
588
});
580
- 

Return to bug 19361