LP#1464709 Rename checkout_ok to is_available

And update pgptap to check for only 2 is_available statuses (not
on-holds shelf).

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index d0cfb00..65dc4db 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -3894,7 +3894,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <field name="opac_visible" reporter:datatype="bool"/>
             <field name="copy_active" reporter:datatype="bool"/>
             <field name="restrict_copy_delete" reporter:datatype="bool"/>
-            <field name="checkout_ok" reporter:datatype="bool"/>
+            <field name="is_available" reporter:datatype="bool"/>
                </fields>
                <links/>
         <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 1c32efe..08aefa9 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -396,7 +396,7 @@ CREATE TABLE config.copy_status (
        opac_visible    BOOL    NOT NULL DEFAULT FALSE,
     copy_active  BOOL    NOT NULL DEFAULT FALSE,
        restrict_copy_delete BOOL         NOT NULL DEFAULT FALSE,
-    checkout_ok  BOOL    NOT NULL DEFAULT FALSE
+    is_available  BOOL    NOT NULL DEFAULT FALSE
 );
 COMMENT ON TABLE config.copy_status IS $$
 Copy Statuses

diff --git a/Open-ILS/src/sql/Pg/100.circ_matrix.sql b/Open-ILS/src/sql/Pg/100.circ_matrix.sql
index c53e7ee..566588b 100644 (file)
--- a/Open-ILS/src/sql/Pg/100.circ_matrix.sql
+++ b/Open-ILS/src/sql/Pg/100.circ_matrix.sql
@@ -500,7 +500,7 @@ BEGIN
 
     -- Fail if the item isn't in a circulateable status on a non-renewal
     IF NOT renewal AND item_object.status NOT IN ( 
-        (SELECT id FROM config.copy_status WHERE checkout_ok) ) THEN 
+        (SELECT id FROM config.copy_status WHERE is_available) ) THEN 
         result.fail_part := 'asset.copy.status';
         result.success := FALSE;
         done := TRUE;

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 1209408..c198d35 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -306,15 +306,15 @@ INSERT INTO config.rule_age_hold_protect VALUES
        (2, oils_i18n_gettext(2, '6month', 'crahp', 'name'), '6 months', 2);
 SELECT SETVAL('config.rule_age_hold_protect_id_seq'::TEXT, 100);
 
-INSERT INTO config.copy_status (id,name,holdable,opac_visible,copy_active,checkout_ok) VALUES (0,oils_i18n_gettext(0, 'Available', 'ccs', 'name'),'t','t','t','t');
+INSERT INTO config.copy_status (id,name,holdable,opac_visible,copy_active,is_available) VALUES (0,oils_i18n_gettext(0, 'Available', 'ccs', 'name'),'t','t','t','t');
 INSERT INTO config.copy_status (id,name,holdable,opac_visible,copy_active,restrict_copy_delete) VALUES (1,oils_i18n_gettext(1, 'Checked out', 'ccs', 'name'),'t','t','t','t');
 INSERT INTO config.copy_status (id,name) VALUES (2,oils_i18n_gettext(2, 'Bindery', 'ccs', 'name'));
 INSERT INTO config.copy_status (id,name,restrict_copy_delete) VALUES (3,oils_i18n_gettext(3, 'Lost', 'ccs', 'name'),'t');
 INSERT INTO config.copy_status (id,name) VALUES (4,oils_i18n_gettext(4, 'Missing', 'ccs', 'name'));
 INSERT INTO config.copy_status (id,name,holdable,opac_visible) VALUES (5,oils_i18n_gettext(5, 'In process', 'ccs', 'name'),'t','t');
 INSERT INTO config.copy_status (id,name,holdable,opac_visible,restrict_copy_delete) VALUES (6,oils_i18n_gettext(6, 'In transit', 'ccs', 'name'),'t','t','t');
-INSERT INTO config.copy_status (id,name,holdable,opac_visible,copy_active,checkout_ok) VALUES (7,oils_i18n_gettext(7, 'Reshelving', 'ccs', 'name'),'t','t','t','t');
-INSERT INTO config.copy_status (id,name,holdable,opac_visible,copy_active,restrict_copy_delete,checkout_ok) VALUES (8,oils_i18n_gettext(8, 'On holds shelf', 'ccs', 'name'),'t','t','t','t','t');
+INSERT INTO config.copy_status (id,name,holdable,opac_visible,copy_active,is_available) VALUES (7,oils_i18n_gettext(7, 'Reshelving', 'ccs', 'name'),'t','t','t','t');
+INSERT INTO config.copy_status (id,name,holdable,opac_visible,copy_active,restrict_copy_delete,is_available) VALUES (8,oils_i18n_gettext(8, 'On holds shelf', 'ccs', 'name'),'t','t','t','t','t');
 INSERT INTO config.copy_status (id,name,holdable,opac_visible) VALUES (9,oils_i18n_gettext(9, 'On order', 'ccs', 'name'),'t','t');
 INSERT INTO config.copy_status (id,name,copy_active) VALUES (10,oils_i18n_gettext(10, 'ILL', 'ccs', 'name'),'t');
 INSERT INTO config.copy_status (id,name) VALUES (11,oils_i18n_gettext(11, 'Cataloging', 'ccs', 'name'));

diff --git a/Open-ILS/src/sql/Pg/live_t/lp1464709-copy-stat-co-ok.live.pg b/Open-ILS/src/sql/Pg/live_t/lp1464709-copy-stat-co-ok.live.pg
index 2874298..21b68a0 100644 (file)
--- a/Open-ILS/src/sql/Pg/live_t/lp1464709-copy-stat-co-ok.live.pg
+++ b/Open-ILS/src/sql/Pg/live_t/lp1464709-copy-stat-co-ok.live.pg
@@ -24,22 +24,22 @@ SELECT is(
     'Checkout test Available succeeds'
 ) FROM action.item_user_circ_test(4, 1, 1);
 
--- checkout_ok defaults to false
+-- is_available defaults to false
 INSERT into config.copy_status (id, name) VALUES (101, 'lp1464709');
 UPDATE asset.copy SET status = 101 WHERE id = 1;
 
 SELECT is(
     fail_part,
     'asset.copy.status',
-    'Checkout test checkout_ok=false fails'
+    'Checkout test is_available=false fails'
 ) FROM action.item_user_circ_test(4, 1, 1);
 
-UPDATE config.copy_status SET checkout_ok = TRUE WHERE name = 'lp1464709';
+UPDATE config.copy_status SET is_available = TRUE WHERE name = 'lp1464709';
 
 SELECT is(
     fail_part,
     NULL,
-    'Checkout test checkout_ok=true succeeds'
+    'Checkout test is_available=true succeeds'
 ) FROM action.item_user_circ_test(4, 1, 1);
 
 

diff --git a/Open-ILS/src/sql/Pg/t/lp1464709-copy-stat-co-ok.pg b/Open-ILS/src/sql/Pg/t/lp1464709-copy-stat-co-ok.pg
index dfe9a99..070eb88 100644 (file)
--- a/Open-ILS/src/sql/Pg/t/lp1464709-copy-stat-co-ok.pg
+++ b/Open-ILS/src/sql/Pg/t/lp1464709-copy-stat-co-ok.pg
@@ -20,9 +20,9 @@ SELECT plan(1);
 
 -- ensures the column exists and seed data has been updated.
 SELECT cmp_ok(
-    COUNT(*)::int, '>=', 3, 
-    'At least 3 copy status should be configured as "checkout_ok"') 
-    FROM config.copy_status WHERE checkout_ok;
+    COUNT(*)::int, '>=', 2, 
+    'At least 2 copy status should be configured as "is_available"') 
+    FROM config.copy_status WHERE is_available;
 
 -- Finish the tests and clean up.
 SELECT * FROM finish();

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.copy_status_co_allowed.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.copy_status_co_allowed.sql
index e1e3509..b787c1a 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.copy_status_co_allowed.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.copy_status_co_allowed.sql
@@ -1,9 +1,9 @@
 BEGIN;
 
 ALTER TABLE config.copy_status
-    ADD COLUMN checkout_ok BOOL NOT NULL DEFAULT FALSE;
+    ADD COLUMN is_available BOOL NOT NULL DEFAULT FALSE;
 
-UPDATE config.copy_status SET checkout_ok = TRUE
+UPDATE config.copy_status SET is_available = TRUE
     WHERE id IN (0, 7, 8); -- available, reshelving, holds shelf.
 
 CREATE OR REPLACE FUNCTION action.item_user_circ_test( circ_ou INT, match_item BIGINT, match_user INT, renewal BOOL ) RETURNS SETOF action.circ_matrix_test_result AS $func$
@@ -93,7 +93,7 @@ BEGIN
 
     -- Fail if the item isn't in a circulateable status on a non-renewal
     IF NOT renewal AND item_object.status NOT IN ( 
-        (SELECT id FROM config.copy_status WHERE checkout_ok) ) THEN 
+        (SELECT id FROM config.copy_status WHERE is_available) ) THEN 
         result.fail_part := 'asset.copy.status';
         result.success := FALSE;
         done := TRUE;

diff --git a/Open-ILS/web/conify/global/config/copy_status.html b/Open-ILS/web/conify/global/config/copy_status.html
index c9a3699..af3c67b 100644 (file)
--- a/Open-ILS/web/conify/global/config/copy_status.html
+++ b/Open-ILS/web/conify/global/config/copy_status.html
@@ -227,13 +227,13 @@
                                                                                        }
                                                                                  }
                                                                                },
-                                                                               { name : ccs_strings.CHECKOUT_OK,
-                                                                                 field : "checkout_ok",
+                                                                               { name : ccs_strings.IS_AVAILABLE,
+                                                                                 field : "is_available",
                                                                                  editor : dojox.grid.editors.bool,
                                                                                  get : function (row) {
                                                                                        var r = window.status_data_model.getRow(row);
                                                                                        if (r) {
-                                                                                               var h = r.checkout_ok;
+                                                                                               var h = r.is_available;
                                                                                                if (h == 't' || h === true) return true;
                                                                                                return false;
                                                                                        }

diff --git a/Open-ILS/web/js/dojo/openils/conify/nls/conify.js b/Open-ILS/web/js/dojo/openils/conify/nls/conify.js
index 1dfc1d3..ef9a7ad 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/conify/nls/conify.js
+++ b/Open-ILS/web/js/dojo/openils/conify/nls/conify.js
@@ -7,7 +7,7 @@
        "CONFIRM_EXIT_PPL": "There are unsaved modified permissions. Click OK to save these changes, or Cancel to abandon them.",
        "CONFIRM_UNSAVED_CHANGES": "There are unsaved changes to one or more organization types. Click OK to save these changes, or Cancel to abandon them.",
        "COPY_ACTIVE": "Sets copy active",
-       "CHECKOUT_OK": "Checkout OK",
+       "IS_AVAILABLE": "Is Available",
        "ERROR_CALLING_METHOD_AOUT": "Problem calling method to create child organization type",
        "ERROR_CALLING_METHOD_CAM": "Problem calling method to create new ${0}",
        "ERROR_CALLING_METHOD_CCS": "Problem calling method to create new copy status",