From b83f6111636ad29376de903c888e1b8ce384e508 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 20 May 2010 04:54:11 +0000
Subject: [PATCH] rework these column definitions for pre-cats, since all rows
 in the list are getting mvr objects now

git-svn-id: svn://svn.open-ils.org/ILS/trunk@16459 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/xul/staff_client/server/circ/util.js | 33 ++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 089a860f32..a08239cdff 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -991,8 +991,15 @@ circ.util.columns = function(modify,params) {
             'primary' : false,
             'hidden' : true,
             'editable' : false, 'render' : function(my) {
-                try {  return my.mvr.title(); }
-                catch(E) { return my.acp.dummy_title(); }
+                if (my.mvr) {
+                    if (my.mvr.doc_id() == -1) {
+                        return my.acp.dummy_title();
+                    } else {
+                        return my.mvr.title();
+                    }
+                } else {
+                    return my.acp.dummy_title();
+                }
             }
         },
         {
@@ -1004,8 +1011,15 @@ circ.util.columns = function(modify,params) {
             'primary' : false,
             'hidden' : true,
             'editable' : false, 'render' : function(my) {
-                try { return my.mvr.author(); }
-                catch(E) { return my.acp.dummy_author(); }
+                if (my.mvr) {
+                    if (my.mvr.doc_id() == -1) {
+                        return my.acp.dummy_author();
+                    } else {
+                        return my.mvr.author();
+                    }
+                } else {
+                    return my.acp.dummy_author();
+                }
             }
         },
         {
@@ -1027,8 +1041,15 @@ circ.util.columns = function(modify,params) {
             'primary' : false,
             'hidden' : true,
             'editable' : false, 'render' : function(my) { 
-                try { return my.mvr.isbn(); }
-                catch(E) { return my.acp.dummy_isbn(); }
+                if (my.mvr) {
+                    if (my.mvr.doc_id() == -1) {
+                        return my.acp.dummy_isbn();
+                    } else {
+                        return my.mvr.isbn();
+                    }
+                } else {
+                    return my.acp.dummy_isbn();
+                }
             }
         },
         {
-- 
2.11.0