[open-ils-commits] [GIT] Evergreen ILS branch rel_3_4 updated. 05225f8bf73071c8f61d1654648f547d0d8f7ea5

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_3_4 has been updated
       via  05225f8bf73071c8f61d1654648f547d0d8f7ea5 (commit)
       via  242846c26ab4a66a44f63e2b2ff5785c526b3f6d (commit)
      from  064ef0cd796d9195ec6533765230ac8ce4e5fbde (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 05225f8bf73071c8f61d1654648f547d0d8f7ea5
Author: Bill Erickson <berickxx at gmail.com>
Date:   Mon Sep 16 11:26:10 2019 -0400

    LP1841823 Marc flat editor repair slashes (Angular)
    
    Replace all control field spaces with backslashes in MARC Flat text
    editor, Anglular edition.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Elaine Hardy <ehardy at georgialibraries.org>

diff --git a/Open-ILS/src/eg2/src/assets/js/marcrecord.js b/Open-ILS/src/eg2/src/assets/js/marcrecord.js
index 04d8c74cce..97340c0602 100644
--- a/Open-ILS/src/eg2/src/assets/js/marcrecord.js
+++ b/Open-ILS/src/eg2/src/assets/js/marcrecord.js
@@ -15,7 +15,7 @@
  */
 
 /*
- * Copy of file from Open-ILS/web/js/ui/default/staff/marcedit.js
+ * Copy of file from Open-ILS/web/js/ui/default/staff/marcrecord.js
  *
  * This copy of the the MARC21 library heavily modified by
  * Bill Erickson <berickxx at gmail.com> 2019 circa Evergreen 3.3.
@@ -311,7 +311,7 @@ var MARC21 = {
                             new MARC21.Field({
                                 record : me,
                                 tag    : line_tag(current_line),
-                                data   : cf_line_data(current_line).replace('\\',' ','g'),
+                                data   : cf_line_data(current_line).replace(/\\/g, ' ')
                             })
                         );
                     }
@@ -381,7 +381,7 @@ var MARC21 = {
 
             mtxt += this.fields.map( function (f) {
                 if (f.isControlfield()) {
-                    if (f.data) return '=' + f.tag + ' ' + f.data.replace(' ','\\','g');
+                    if (f.data) return '=' + f.tag + ' ' + f.data.replace(/ /g, '\\');
                     return '=' + f.tag;
                 } else {
                     return '=' + f.tag + ' ' +

commit 242846c26ab4a66a44f63e2b2ff5785c526b3f6d
Author: Bill Erickson <berickxx at gmail.com>
Date:   Mon Sep 16 11:26:23 2019 -0400

    LP1841823 Marc flat editor repair slashes (AngJS)
    
    Replace all control field spaces with backslashes in MARC Flat text
    editor (AngJS edition).
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Elaine Hardy <ehardy at georgialibraries.org>

diff --git a/Open-ILS/web/js/ui/default/staff/marcrecord.js b/Open-ILS/web/js/ui/default/staff/marcrecord.js
index 9fe525b10a..2e3a422a70 100644
--- a/Open-ILS/web/js/ui/default/staff/marcrecord.js
+++ b/Open-ILS/web/js/ui/default/staff/marcrecord.js
@@ -297,7 +297,7 @@ var MARC21 = {
                             new MARC21.Field({
                                 record : me,
                                 tag    : line_tag(current_line),
-                                data   : cf_line_data(current_line).replace('\\',' ','g'),
+                                data   : cf_line_data(current_line).replace(/\\/g, ' ')
                             })
                         );
                     }
@@ -367,7 +367,7 @@ var MARC21 = {
 
             mtxt += this.fields.map( function (f) {
                 if (f.isControlfield()) {
-                    if (f.data) return '=' + f.tag + ' ' + f.data.replace(' ','\\','g');
+                    if (f.data) return '=' + f.tag + ' ' + f.data.replace(/ /g, '\\');
                     return '=' + f.tag;
                 } else {
                     return '=' + f.tag + ' ' +

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/eg2/src/assets/js/marcrecord.js   | 6 +++---
 Open-ILS/web/js/ui/default/staff/marcrecord.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Evergreen ILS