From 8d2f7b1c7540aba7156c08e493198331558c8ae4 Mon Sep 17 00:00:00 2001 From: Dan Wells Date: Fri, 30 Mar 2012 16:17:47 -0400 Subject: [PATCH] holding_type on serial.issuance not quite dead The holding_type field was removed from the serial control editor prematurely, and this missing data was a source of mild friction. We'll put it back for now. Signed-off-by: Dan Wells Signed-off-by: Mike Rylander --- .../src/sql/Pg/upgrade/XXXX.schema.serial-holding-groups.sql | 6 ++++++ Open-ILS/xul/staff_client/server/serial/siss_editor.js | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.serial-holding-groups.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.serial-holding-groups.sql index 695ce81012..27246a1357 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.serial-holding-groups.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.serial-holding-groups.sql @@ -146,4 +146,10 @@ UPDATE config.internal_flag -- finish holding code materialization process +-- fix up missing holding_code fields from serial.issuance +UPDATE serial.issuance siss + SET holding_type = scap.type + FROM serial.caption_and_pattern scap + WHERE scap.id = siss.caption_and_pattern AND siss.holding_type IS NULL; + COMMIT; diff --git a/Open-ILS/xul/staff_client/server/serial/siss_editor.js b/Open-ILS/xul/staff_client/server/serial/siss_editor.js index 666c761fb6..bb041314f5 100644 --- a/Open-ILS/xul/staff_client/server/serial/siss_editor.js +++ b/Open-ILS/xul/staff_client/server/serial/siss_editor.js @@ -119,14 +119,15 @@ serial.siss_editor.prototype = { 'siss_editor_middle_pane' : [ -/*rjs7 don't think we need these anymore [ - 'Holding Type', + [ + 'holding_type', { - render: 'fm.holding_type();', - input: 'c = function(v){ obj.apply("holding_type",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ ["basic", "basic"], ["index", "index"], ["supplement", "supplement"] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);', + input: 'c = function(v){ obj.apply("holding_type",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ ["basic", "basic"], ["index", "index"], ["supplement", "supplement"] ] ); x.setAttribute("value",obj.editor_values.holding_type); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);', + value_key: 'holding_type', + required: true } ], - [ +/* deprecated [ 'Holding Link ID', { render: 'fm.holding_link_id();', -- 2.11.0