[open-ils-commits] [GIT] Evergreen ILS branch master updated. 3bc28aedbe392efaf8d6930deebb898c1406b0f9

[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  3bc28aedbe392efaf8d6930deebb898c1406b0f9 (commit)
      from  5615a6ecc50206e5089ccc128ba0fc9ea7df04e0 (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 3bc28aedbe392efaf8d6930deebb898c1406b0f9
Author: Bill Erickson <berickxx at gmail.com>
Date:   Tue Jun 19 11:27:43 2018 -0400

    LP1739284 Bib summary fetches classification scheme
    
    Always fetch the classification scheme org setting (or access the cached
    value) instead of relying on the value getting stored in advance in
    egEnv.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Open-ILS/web/js/ui/default/staff/cat/services/record.js b/Open-ILS/web/js/ui/default/staff/cat/services/record.js
index 5560553..100f97c 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/services/record.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/services/record.js
@@ -161,14 +161,18 @@ angular.module('egCoreMod')
                     $scope.bib_cn = null;
                     $scope.bib_cn_tooltip = '';
                     var label_class = 1;
-                    if (egCore.env.aous) 
-                        label_class = egCore.env.aous['cat.default_classification_scheme'] || 1;
-                    egCore.net.request(
-                        'open-ils.cat',
-                        'open-ils.cat.biblio.record.marc_cn.retrieve',
-                        $scope.recordId,
-                        label_class
-                    ).then(function(cn_array) {
+                    egCore.org.settings(['cat.default_classification_scheme'])
+                    .then(function(s) {
+                        var scheme = s['cat.default_classification_scheme'];
+                        label_class = scheme || 1;
+
+                        return egCore.net.request(
+                            'open-ils.cat',
+                            'open-ils.cat.biblio.record.marc_cn.retrieve',
+                            $scope.recordId,
+                            label_class
+                        )
+                    }).then(function(cn_array) {
                         var tooltip = '';
                         if (cn_array.length > 0) {
                             for (var field in cn_array[0]) {

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

Summary of changes:
 .../web/js/ui/default/staff/cat/services/record.js |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Evergreen ILS