[open-ils-commits] [GIT] Evergreen ILS branch master updated. 7f23400c38641ddefcc2caa472e7198596a895ea

[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, master has been updated
       via  7f23400c38641ddefcc2caa472e7198596a895ea (commit)
      from  fb31c0cc5a6d67b2f989e39f38961b6d20872f8f (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 7f23400c38641ddefcc2caa472e7198596a895ea
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Fri Sep 29 09:33:33 2017 -0400

    LP#1720345: ensure egEditFmRecord's customFieldTemplates is optional
    
    This patch ensures that the custom-field-templates attribute of
    the eg-edit-fm-record directive is strictly optional, fixing a
    regression for instances of that directive that don't need that
    attribute.
    
    To test
    -------
    [1] Apply the patch.
    [2] Verify that the Server Administration | Copy Tag Types and
        and Local Administration | Copy Tags admin interfaces
        allow you to create and edit values.
    [3] Verify that the Serials Administration | Prediction
        Pattern Templates interface continues to work.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/web/js/ui/default/staff/services/fm_record_editor.js b/Open-ILS/web/js/ui/default/staff/services/fm_record_editor.js
index 2e08c07..4cb38e5 100644
--- a/Open-ILS/web/js/ui/default/staff/services/fm_record_editor.js
+++ b/Open-ILS/web/js/ui/default/staff/services/fm_record_editor.js
@@ -22,7 +22,7 @@ angular.module('egFmRecordEditorMod',
             //              field value using rec_flat[field.name]
             //   handlers - any functions you want to pass
             //              in to the custom template
-            customFieldTemplates : '=',
+            customFieldTemplates : '=?',
 
             // comma-separated list of fields that should not be
             // displayed
@@ -191,7 +191,7 @@ angular.module('egFmRecordEditorMod',
                         }
                         field.org_default_allowed = (field.name in $scope.org_default_allowed);
                     }
-                    if (field.name in $scope.customFieldTemplates) {
+                    if (angular.isObject($scope.customFieldTemplates) && (field.name in $scope.customFieldTemplates)) {
                         field.use_custom_template = true;
                         field.custom_template = $scope.customFieldTemplates[field.name].template;
                         field.handlers = $scope.customFieldTemplates[field.name].handlers;

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

Summary of changes:
 .../ui/default/staff/services/fm_record_editor.js  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS