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

(-)a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/koha-backend.js (-2 / +2 lines)
Lines 156-162 define( [ '/cgi-bin/koha/svc/cataloguing/framework?frameworkcode=&callback=defin Link Here
156
                    record.addFieldGrouped( newField );
156
                    record.addFieldGrouped( newField );
157
157
158
                    if ( tagnum < '010' ) {
158
                    if ( tagnum < '010' ) {
159
                        newField.addSubfield( [ '@', '' ] );
159
                        newField.addSubfield( [ '@', (taginfo.subfields[0] ? taginfo.subfields[0][1].defaultvalue : null ) || '' ] );
160
                        return;
160
                        return;
161
                    }
161
                    }
162
                }
162
                }
Lines 167-173 define( [ '/cgi-bin/koha/svc/cataloguing/framework?frameworkcode=&callback=defin Link Here
167
                    if ( subfieldinfo.mandatory != "1" && !allTags ) return;
167
                    if ( subfieldinfo.mandatory != "1" && !allTags ) return;
168
168
169
                    $.each( fields, function( undef, field ) {
169
                    $.each( fields, function( undef, field ) {
170
                        if ( !field.hasSubfield(subfieldcode) ) field.addSubfieldGrouped( [ subfieldcode, '' ] );
170
                        if ( !field.hasSubfield(subfieldcode) ) field.addSubfieldGrouped( [ subfieldcode, subfieldinfo.defaultvalue || '' ] );
171
                    } );
171
                    } );
172
                } );
172
                } );
173
            } );
173
            } );
(-)a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js (-1 / +1 lines)
Lines 172-178 define( [ 'marc-record', 'koha-backend', 'preferences', 'text-marc', 'widget' ], Link Here
172
172
173
            for ( var i = positions.length - 1; i >= 0; i-- ) {
173
            for ( var i = positions.length - 1; i >= 0; i-- ) {
174
                if ( positions[i].ch < cur.ch ) {
174
                if ( positions[i].ch < cur.ch ) {
175
                    activateTabPosition( cm, positions[i] );
175
                    activateTabPosition( cm, positions[i], -1 );
176
                    return false;
176
                    return false;
177
                }
177
                }
178
            }
178
            }
(-)a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/resources.js (-2 / +6 lines)
Lines 31-38 define( [ 'module' ], function( module ) { Link Here
31
        _allResources.push(deferred);
31
        _allResources.push(deferred);
32
    }
32
    }
33
33
34
    _res( 'marc21/xml/006', $.get( module.config().themelang + '/data/marc21_field_006.xml' ) );
34
    switch ( module.config().marcflavour ) {
35
    _res( 'marc21/xml/008', $.get( module.config().themelang + '/data/marc21_field_008.xml' ) );
35
        case 'MARC21':
36
            _res( 'marc21/xml/006', $.get( module.config().themelang + '/data/marc21_field_006.xml' ) );
37
            _res( 'marc21/xml/008', $.get( module.config().themelang + '/data/marc21_field_008.xml' ) );
38
            break;
39
    }
36
40
37
    return Resources;
41
    return Resources;
38
} );
42
} );
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc (-1 / +2 lines)
Lines 7-12 require.config( { Link Here
7
    baseUrl: '/intranet-tmpl/lib/koha/cateditor/',
7
    baseUrl: '/intranet-tmpl/lib/koha/cateditor/',
8
    config: {
8
    config: {
9
        resources: {
9
        resources: {
10
            marcflavour: '[% marcflavour %]',
10
            themelang: '[% themelang %]',
11
            themelang: '[% themelang %]',
11
        },
12
        },
12
    },
13
    },
Lines 179-185 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here
179
                var first = tag[0];
180
                var first = tag[0];
180
                var url = "http://archive.ifla.org/VI/3/p1996-1/uni" + first + ".htm#";
181
                var url = "http://archive.ifla.org/VI/3/p1996-1/uni" + first + ".htm#";
181
                if ( first == '0' ) url += "b";
182
                if ( first == '0' ) url += "b";
182
                if ( first != '9' ) url += field;
183
                if ( first != '9' ) url += tag;
183
184
184
                return url;
185
                return url;
185
            }
186
            }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-2 / +1 lines)
Lines 116-122 Link Here
116
            var biblionumber = [% biblionumber || "null" %];
116
            var biblionumber = [% biblionumber || "null" %];
117
117
118
            if ( biblionumber ) {
118
            if ( biblionumber ) {
119
                window.location = '/cgi-bin/koha/cataloguing/editor.pl#catalog:' + biblionumber;
119
                window.location = '/cgi-bin/koha/cataloguing/editor.pl#catalog/' + biblionumber;
120
            } else {
120
            } else {
121
                window.location = '/cgi-bin/koha/cataloguing/editor.pl';
121
                window.location = '/cgi-bin/koha/cataloguing/editor.pl';
122
            }
122
            }
123
- 

Return to bug 11559