show owning_lib with callnumber in copy editor

git-svn-id: svn://svn.open-ils.org/ILS/trunk@5279 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/cat/copy_editor.js b/Open-ILS/xul/staff_client/server/cat/copy_editor.js
index 5c95604..343e90f 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/copy_editor.js
+++ b/Open-ILS/xul/staff_client/server/cat/copy_editor.js
@@ -425,7 +425,7 @@ g.changed = {};
 /* These need data from the middle layer to render */
 
 g.special_exception = {
-       'Call Number' : function(label,value) {
+       'Owning Lib : Call Number' : function(label,value) {
                JSAN.use('util.widgets');
                if (value>0) { /* an existing call number */
                        g.network.request(
@@ -435,16 +435,16 @@ g.special_exception = {
                                function(req) {
                                        var cn = '??? id = ' + value;
                                        try {
-                                               cn = req.getResultObject().label();
+                                               cn = req.getResultObject();
                                        } catch(E) {
                                                g.error.sdump('D_ERROR','callnumber retrieve: ' + E);
                                        }
-                                       util.widgets.set_text(label,cn);
+                                       util.widgets.set_text(label,g.data.hash.aou[ cn.owning_lib() ].shortname() + ' : ' + cn.label());
                                }
                        );
                } else { /* a yet to be created call number */
                        if (g.callnumbers) {
-                               util.widgets.set_text(label,g.callnumbers[value]);
+                               util.widgets.set_text(label,g.data.hash.aou[ g.callnumbers[value].owning_lib ].shortname() + ' : ' + g.callnumbers[value].label);
                        }
                }
        },
@@ -550,7 +550,7 @@ g.panes_and_field_names = {
                } 
        ],
        [
-               "Call Number",  
+               "Owning Lib : Call Number",     
                {
                        render: 'fm.call_number();',
                }

diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
index 7e51595..8e9f3df 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
@@ -329,7 +329,7 @@ g.stash_and_close = function() {
                                volume.copies( [] );
                                volumes.push( volume );
 
-                               volume_labels[ acn_id ] = cn;
+                               volume_labels[ acn_id ] = { 'label' : cn, 'owning_lib' : ou_id };
 
                                for (var i = 0; i < volumes_hash[ou_id][cn].length; i++) {
                                        var copy = new acp();