From 35cb81391fcdefbe3bd2429cd9fada28171551ec Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Tue, 6 May 2014 11:50:19 -0600 Subject: [PATCH] Bug 11559 followup - Allow insertion of dollar sign, remove fixFloat The dollar sign now shows up as {dollar} inside subfield contents. This is converted on load and save. Also, remove fixFloat, as it has moved and is no longer needed anyway. --- .../intranet-tmpl/lib/koha/cateditor/text-marc.js | 17 +++++++++++++---- .../prog/en/modules/cataloguing/editor.tt | 1 - 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/text-marc.js b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/text-marc.js index 5c76c62..f522f2c 100644 --- a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/text-marc.js +++ b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/text-marc.js @@ -1,4 +1,13 @@ define( [ 'marc-record' ], function( MARC ) { + // Convert any characters for display + function _sanitize( text ) { + return text.replace( '$', '{dollar}' ); + } + + // Undo conversion + function _desanitize( text ) { + return text.replace( '{dollar}', '$' ); + } return { RecordToText: function( record ) { var lines = []; @@ -8,7 +17,7 @@ define( [ 'marc-record' ], function( MARC ) { var field = fields[i]; if ( field.isControlField() ) { - lines.push( field.tagnumber() + ' ' + field.subfield( '@' ) ); + lines.push( field.tagnumber() + ' ' + _sanitize( field.subfield( '@' ) ) ); } else { var result = [ field.tagnumber() + ' ' ]; @@ -16,7 +25,7 @@ define( [ 'marc-record' ], function( MARC ) { result.push( field.indicator(1) == ' ' ? '_' : field.indicator(1), ' ' ); $.each( field.subfields(), function( i, subfield ) { - result.push( '$' + subfield[0] + ' ' + subfield[1] ); + result.push( '$' + subfield[0] + ' ' + _sanitize( subfield[1] ) ); } ); lines.push( result.join('') ); @@ -40,7 +49,7 @@ define( [ 'marc-record' ], function( MARC ) { tagNumber = tagNumber[1]; if ( tagNumber < '010' ) { - var field = new MARC.Field( tagNumber, ' ', ' ', [ [ '@', line.substring( 4 ) ] ] ); + var field = new MARC.Field( tagNumber, ' ', ' ', [ [ '@', _desanitize( line.substring( 4 ) ) ] ] ); field.sourceLine = i; record.addField( field ); } else { @@ -64,7 +73,7 @@ define( [ 'marc-record' ], function( MARC ) { $.each( subfields, function( i, subfield ) { var next = subfields[ i + 1 ]; - field.addSubfield( [ subfield.code, line.substring( subfield.ch + 3, next ? next.ch : line.length ) ] ); + field.addSubfield( [ subfield.code, _desanitize( line.substring( subfield.ch + 3, next ? next.ch : line.length ) ) ] ); } ); field.sourceLine = i; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt index 6d61381..17ef1b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt @@ -1,7 +1,6 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Cataloging › Editor [% INCLUDE 'doc-head-close.inc' %] - -- 1.7.2.5