@@ -, +, @@ syspref to look for XML files url: this.themelang + "/data/marc21_field_" + this.tagfield + ".xml", - Make sure you have a MARC21 installation - Set marcflavour = NORMARC - Go to Cataloguing and start a new record with the default framework - Open the value builders for 006 and 008 and observe that they still work, showing the coded values for MARC21 - Apply this patch - Check the value builders for 006 and 008 and observe that you get a truncated view with an empty "Select a type of material" dropdown - Use e.g. the Net console in Firebug to observe requests to http://localhost/intranet-tmpl/prog/en/data/normarc_field_008.xml that result in a 404 status - Set marcflavour = MARC21 - Observe that the value builders for 006 and 008 are now fully working - 006 and 008 should be the only value builders affected by this change, since they are the only ones using xmlControlfield.js, but please also verify that other value builders are still working as expected --- koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js | 5 +++-- .../prog/en/modules/cataloguing/value_builder/marc21_field_006.tt | 2 +- .../prog/en/modules/cataloguing/value_builder/marc21_field_008.tt | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js +++ a/koha-tmpl/intranet-tmpl/prog/en/js/xmlControlfield.js @@ -168,7 +168,7 @@ function changeH4Result(form, h4_result, tr_result, pos, value) (function() { - xmlControlField = function(tagfield, form_id, select, table, h4_result, tr_result, idMaterial, themelang) + xmlControlField = function(tagfield, form_id, select, table, h4_result, tr_result, idMaterial, themelang, marcflavour) { this.tagfield = tagfield; this.idMaterial = idMaterial; @@ -179,6 +179,7 @@ function changeH4Result(form, h4_result, tr_result, pos, value) this.h4_result = h4_result; this.tr_result = tr_result; this.themelang = themelang; + this.marcflavour = marcflavour.toLowerCase(); };//xmlControlField @@ -205,7 +206,7 @@ function changeH4Result(form, h4_result, tr_result, pos, value) { this.xmlDoc = $.ajax({ type: "GET", - url: this.themelang + "/data/marc21_field_" + this.tagfield + ".xml", + url: this.themelang + "/data/" + this.marcflavour + "_field_" + this.tagfield + ".xml", dataType: "xml", async: false }).responseXML; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tt @@ -16,7 +16,7 @@ var form = document.f_pop; h4_result = document.getElementById("h4_result"); tr_result = document.getElementById("tr_result"); - objXmlControlField = new xmlControlField('[% tagfield %]', 'f_pop', document.getElementById('material_type'), document.getElementById('table_material_types'), 'h4_result', 'tr_result', '', '[% themelang %]'); + objXmlControlField = new xmlControlField('[% tagfield %]', 'f_pop', document.getElementById('material_type'), document.getElementById('table_material_types'), 'h4_result', 'tr_result', '', '[% themelang %]', '[% marcflavour %]'); objXmlControlField.loadXmlValues(); renderResult(tr_result, (form.result.value != "")?form.result.value:returnValueParam("result")); [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tt @@ -16,7 +16,7 @@ var form = document.f_pop; h4_result = document.getElementById("h4_result"); tr_result = document.getElementById("tr_result"); - objXmlControlField = new xmlControlField('[% tagfield %]', 'f_pop', document.getElementById('material_type'), document.getElementById('table_material_types'), 'h4_result', 'tr_result', '', '[% themelang %]'); + objXmlControlField = new xmlControlField('[% tagfield %]', 'f_pop', document.getElementById('material_type'), document.getElementById('table_material_types'), 'h4_result', 'tr_result', '', '[% themelang %]', '[% marcflavour %]'); objXmlControlField.loadXmlValues(); renderResult(tr_result, (form.result.value != "")?form.result.value:returnValueParam("result")); [% END %] --