[open-ils-commits] [GIT] Evergreen ILS branch master updated. 3391572ff63fab77b163b3567aaa04599ebe4430

Evergreen Git git at git.evergreen-ils.org
Tue Jan 31 15:00:21 EST 2012


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  3391572ff63fab77b163b3567aaa04599ebe4430 (commit)
       via  e4691aba9a8738da1889c6c3f2e5965dee971980 (commit)
       via  ebc160369a4e13fcfe9230742e499f62d32d0d60 (commit)
       via  24cdcd766ca3dc819b49790ac9cdfeea7c2dc928 (commit)
       via  921a19e3fb495efa5b0bc1c830e506e4ae7264c4 (commit)
       via  5cd2e2874b0d85e7a283f7da77e74e4fd0e60de4 (commit)
      from  634a0db6a5f7970d842b7bb1017f68da2f23317d (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 3391572ff63fab77b163b3567aaa04599ebe4430
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date:   Tue Jan 31 14:56:56 2012 -0500

    Upgrade script finalization, adding new perm to database
    
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 4672bac..9914d60 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -86,7 +86,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0673', :eg_version); -- berick/senator
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0674', :eg_version); -- phasefx/Dyrcona/senator
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
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 220e472..4445f86 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1527,7 +1527,9 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES
  ( 518, 'COPY_HOLDS_RECALL', oils_i18n_gettext( 518, 
     'Allow a user to place a cataloging recall on a specific copy', 'ppl', 'description' )),
  ( 519, 'ADMIN_SMS_CARRIER', oils_i18n_gettext( 519,
-    'Allows a user to add/create/delete SMS Carrier entries.', 'ppl', 'description' ));
+    'Allows a user to add/create/delete SMS Carrier entries.', 'ppl', 'description' )),
+ ( 520, 'COPY_DELETE_WARNING.override', oils_i18n_gettext( 520,
+    'Allow a user to override warnings about deleting copies in problematic situations.', 'ppl', 'description' ));
 
 
 SELECT SETVAL('permission.perm_list_id_seq'::TEXT, 1000);
diff --git a/Open-ILS/src/sql/Pg/upgrade/0674.config.copy_status.restrict_copy_delete.sql b/Open-ILS/src/sql/Pg/upgrade/0674.config.copy_status.restrict_copy_delete.sql
new file mode 100644
index 0000000..b7364c9
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0674.config.copy_status.restrict_copy_delete.sql
@@ -0,0 +1,18 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0674', :eg_version);
+
+ALTER TABLE config.copy_status
+	  ADD COLUMN restrict_copy_delete BOOL NOT NULL DEFAULT FALSE;
+
+UPDATE config.copy_status
+SET restrict_copy_delete = TRUE
+WHERE id IN (1,3,6,8);
+
+INSERT INTO permission.perm_list (id, code, description) VALUES (
+    520,
+    'COPY_DELETE_WARNING.override',
+    'Allow a user to override warnings about deleting copies in problematic situations.'
+);
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.config.copy_status.restrict_copy_delete.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.config.copy_status.restrict_copy_delete.sql
deleted file mode 100644
index e91aed2..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.config.copy_status.restrict_copy_delete.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-BEGIN;
-
-ALTER TABLE config.copy_status
-	  ADD COLUMN restrict_copy_delete BOOL NOT NULL DEFAULT FALSE;
-
-UPDATE config.copy_status
-SET restrict_copy_delete = TRUE
-WHERE id IN (1,3,6,8);
-
-COMMIT;

commit e4691aba9a8738da1889c6c3f2e5965dee971980
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Thu Jan 5 17:40:48 2012 -0500

    remove this old speedbump, which now lies
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status.js b/Open-ILS/xul/staff_client/server/circ/copy_status.js
index 29a64d1..c1fbbe4 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_status.js
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status.js
@@ -918,7 +918,6 @@ circ.copy_status.prototype = {
                                         }
                                         break loop;
                                     }
-                                    alert(document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.success'));
                                 }
                             } catch(E) {
                                 obj.error.standard_unexpected_error_alert('copy status -> delete volumes',E);
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
index 2dc7a10..633c2df 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -138,7 +138,6 @@ staff.circ.copy_status.delete_volumes.override=Override Delete Failure?
 staff.circ.copy_status.delete_volumes.delete_copies=You must delete all the items on the volume before you may delete the volume itself.
 staff.circ.copy_status.delete_volumes.delete_copies.confirm=Delete Volume and Items
 staff.circ.copy_status.delete_volumes.delete_copies.cancel=Cancel Delete
-staff.circ.copy_status.delete_volumes.success=Volumes deleted.
 staff.circ.copy_status.mark_volume.status=Volume marked as Item Transfer Destination
 staff.circ.copy_status.mark_volume.prompt=Choose just one Volume to mark as Item Transfer Destination
 staff.circ.copy_status.mark_volume.title=Limit Selection

commit ebc160369a4e13fcfe9230742e499f62d32d0d60
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Thu Jan 5 17:26:06 2012 -0500

    Improve COPY_DELETE_WARNING event handling
    
    Make it overridable in copy buckets, and let Cancel on perm denied dialog fail gracefully.
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>

diff --git a/Open-ILS/xul/staff_client/server/cat/copy_browser.js b/Open-ILS/xul/staff_client/server/cat/copy_browser.js
index c71183f..0fbce27 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_browser.js
+++ b/Open-ILS/xul/staff_client/server/cat/copy_browser.js
@@ -558,7 +558,14 @@ cat.copy_browser.prototype = {
                                         );
                                         if (robj == null) throw(robj);
                                         if (typeof robj.ilsevent != 'undefined') {
-                                            if ( (robj.ilsevent != 0) && (robj.ilsevent != 1227 /* COPY_DELETE_WARNING */) && (robj.ilsevent != 1208 /* TITLE_LAST_COPY */) ) throw(robj);
+                                            if (
+                                                (robj.ilsevent != 0)
+                                                && (robj.ilsevent != 1227 /* COPY_DELETE_WARNING */)
+                                                && (robj.ilsevent != 1208 /* TITLE_LAST_COPY */)
+                                                && (robj.ilsevent != 5000 /* PERM_DENIED */)
+                                            ) {
+                                                throw(robj);
+                                            }
                                         }
                                         obj.refresh_list();
                                     }
@@ -750,6 +757,8 @@ cat.copy_browser.prototype = {
                                                 {
                                                     'title' : document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_volume.override'),
                                                     'overridable_events' : [
+                                                        1208 /* TITLE_LAST_COPY */,
+                                                        1227 /* COPY_DELETE_WARNING */
                                                     ]
                                                 }
                                             );
@@ -769,7 +778,16 @@ cat.copy_browser.prototype = {
                                                         continue loop;
                                                     }
                                                 } else {
-                                                    if (robj.ilsevent != 0) throw(robj);
+                                                    if (typeof robj.ilsevent != 'undefined') {
+                                                        if (
+                                                            (robj.ilsevent != 0)
+                                                            && (robj.ilsevent != 1227 /* COPY_DELETE_WARNING */)
+                                                            && (robj.ilsevent != 1208 /* TITLE_LAST_COPY */)
+                                                            && (robj.ilsevent != 5000 /* PERM_DENIED */)
+                                                        ) {
+                                                            throw(robj);
+                                                        }
+                                                    }
                                                 }
                                             }
                                             break loop;
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets.js b/Open-ILS/xul/staff_client/server/cat/copy_buckets.js
index a9e3137..74fd2bf 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_buckets.js
+++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets.js
@@ -493,26 +493,18 @@ cat.copy_buckets.prototype = {
                                     {
                                         'title' : document.getElementById('catStrings').getString('staff.cat.copy_buckets.batch.error'),
                                         'overridable_events' : [
-                                            1208 /* TITLE_LAST_COPY */
+                                            1208 /* TITLE_LAST_COPY */,
+                                            1227 /* COPY_DELETE_WARNING */
                                         ]
                                     }
                                 );
                                 if (typeof robj.ilsevent != 'undefined') {
                                     switch(Number(robj.ilsevent)) {
                                         case 1208 /* TITLE_LAST_COPY */ :
+                                        case 1227 /* COPY_DELETE_WARNING */ :
+                                        case 5000 /* PERM_DENIED */ :
                                             // ignore this
                                         break;
-                                        case 1227 /* COPY_DELETE_WARNING */ : 
-                                            var copy;
-                                            for (var i = 0; i < copies.length; i++) { if (copies[i].id()==robj.payload) copy = function(a){return a;}(copies[i]); }
-                                            /* The copy in question is not in an ideal status for deleting */
-                                            var err = '*** ' + robj.desc + ' ***\n';
-                                            /* The barcode for the item is {1} */
-                                            err += $('catStrings').getFormattedString('cat.barcode_for_item',[ copy.barcode() ]) + '\n';
-                                            /* The whole batch operation failed */
-                                            err += $('catStrings').getString('cat.batch_operation_failed') + '\n';
-                                            alert(err);
-                                        break;
                                         default:
                                             obj.error.standard_unexpected_error_alert($('catStrings').getString('staff.cat.copy_buckets.batch.error'), robj);
                                     }
diff --git a/Open-ILS/xul/staff_client/server/cat/util.js b/Open-ILS/xul/staff_client/server/cat/util.js
index 046c20f..75a3704 100644
--- a/Open-ILS/xul/staff_client/server/cat/util.js
+++ b/Open-ILS/xul/staff_client/server/cat/util.js
@@ -209,7 +209,14 @@ cat.util.transfer_copies = function(params) {
         );
         
         if (typeof robj.ilsevent != 'undefined') {
-            throw(robj);
+            if (
+                (robj.ilsevent != 0)
+                && (robj.ilsevent != 1227 /* COPY_DELETE_WARNING */)
+                && (robj.ilsevent != 1208 /* TITLE_LAST_COPY */)
+                && (robj.ilsevent != 5000 /* PERM_DENIED */)
+            ) {
+                throw(robj);
+            }
         } else {
             alert($("catStrings").getString('staff.cat.util.transfer_copies.successful_transfer'));
         }
diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status.js b/Open-ILS/xul/staff_client/server/circ/copy_status.js
index 89e6287..29a64d1 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_status.js
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status.js
@@ -627,6 +627,7 @@ circ.copy_status.prototype = {
                                     switch(Number(robj.ilsevent)) {
                                         case 1208 /* TITLE_LAST_COPY */:
                                         case 1227 /* COPY_DELETE_WARNING */:
+                                        case 5000 /* PERM_DENIED */:
                                         break;
                                         default:
                                             obj.error.standard_unexpected_error_alert(document.getElementById('circStrings').getString('staff.circ.copy_status.del_items.success.error'), robj);
@@ -882,6 +883,8 @@ circ.copy_status.prototype = {
                                             {
                                                 'title' : document.getElementById('circStrings').getString('staff.circ.copy_status.delete_volumes.override'),
                                                 'overridable_events' : [
+                                                    1208 /* TITLE_LAST_COPY */,
+                                                    1227 /* COPY_DELETE_WARNING */
                                                 ]
                                             }
                                         );
@@ -901,7 +904,16 @@ circ.copy_status.prototype = {
                                                     continue loop;
                                                 }
                                             } else {
-                                                if (robj.ilsevent != 0) { throw(robj); }
+                                                if (typeof robj.ilsevent != 'undefined') {
+                                                    if (
+                                                        (robj.ilsevent != 0)
+                                                        && (robj.ilsevent != 1227 /* COPY_DELETE_WARNING */)
+                                                        && (robj.ilsevent != 1208 /* TITLE_LAST_COPY */)
+                                                        && (robj.ilsevent != 5000 /* PERM_DENIED */)
+                                                    ) {
+                                                        throw(robj);
+                                                    }
+                                                }
                                             }
                                         }
                                         break loop;

commit 24cdcd766ca3dc819b49790ac9cdfeea7c2dc928
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Thu Jan 5 17:23:39 2012 -0500

    Use the restrict_copy_delete field on copy status
    
    to determine when to throw a COPY_DELETE_WARNING event
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm
index 71a2020..ff75099 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Cat/AssetCommon.pm
@@ -319,17 +319,16 @@ sub update_fleshed_copies {
 sub delete_copy {
 	my($class, $editor, $override, $vol, $copy, $retarget_holds, $force_delete_empty_bib, $skip_empty_cleanup) = @_;
 
-   return $editor->event unless 
-      $editor->allowed('DELETE_COPY', $class->copy_perm_org($vol, $copy));
+	return $editor->event unless
+		$editor->allowed('DELETE_COPY', $class->copy_perm_org($vol, $copy));
 
-	my $stat = $U->copy_status($copy->status)->id;
-
-	unless($override) {
-		return OpenILS::Event->new('COPY_DELETE_WARNING', payload => $copy->id )
-			if $stat == OILS_COPY_STATUS_CHECKED_OUT or
-				$stat == OILS_COPY_STATUS_IN_TRANSIT or
-				$stat == OILS_COPY_STATUS_ON_HOLDS_SHELF or
-				$stat == OILS_COPY_STATUS_ILL;
+	my $stat = $U->copy_status($copy->status);
+	if ($U->is_true($stat->restrict_copy_delete)) {
+		if ($override) {
+			return $editor->event unless $editor->allowed('COPY_DELETE_WARNING.override', $class->copy_perm_org($vol, $copy))
+		} else {
+			return OpenILS::Event->new('COPY_DELETE_WARNING', payload => $copy->id )
+		}
 	}
 
 	$logger->info("vol-update: deleting copy ".$copy->id);

commit 921a19e3fb495efa5b0bc1c830e506e4ae7264c4
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Wed Oct 12 09:38:53 2011 -0400

    Add upgrade script for config.copy_status.restrict_copy_delete.
    
    Adds the column to the config.copy_status table.
    
    Updates the "magical" statues (1,3,6,8) to have restrict_copy_delete
    set to TRUE.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.config.copy_status.restrict_copy_delete.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.config.copy_status.restrict_copy_delete.sql
new file mode 100644
index 0000000..e91aed2
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.config.copy_status.restrict_copy_delete.sql
@@ -0,0 +1,10 @@
+BEGIN;
+
+ALTER TABLE config.copy_status
+	  ADD COLUMN restrict_copy_delete BOOL NOT NULL DEFAULT FALSE;
+
+UPDATE config.copy_status
+SET restrict_copy_delete = TRUE
+WHERE id IN (1,3,6,8);
+
+COMMIT;

commit 5cd2e2874b0d85e7a283f7da77e74e4fd0e60de4
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Wed Oct 12 09:19:49 2011 -0400

    Add restrict_copy_delete field to config.copy_status.
    
    Add the column definition in 002.schema.config.sql.
    Add the field to the class ccs in fm_IDL.xml.
    Set the restrict_copy_delete column to true for the "magical"
    statuses (1,3,6,8) in 950.data.seed-values.sql.
    Add restrict_delete as essential column to config.copy_status in
    OpenILS::Application::Storage::CDBI::config
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index b9c3bde..c4c5daa 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -3004,6 +3004,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<field name="name"  reporter:datatype="text" oils_persist:i18n="true"/>
 			<field name="opac_visible" reporter:datatype="bool"/>
             <field name="copy_active" reporter:datatype="bool"/>
+	    <field name="restrict_copy_delete" reporter:datatype="bool"/>
 		</fields>
 		<links/>
         <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI/config.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI/config.pm
index 54a13e3..3873405 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI/config.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/CDBI/config.pm
@@ -73,7 +73,7 @@ package config::copy_status;
 use base qw/config/;
 __PACKAGE__->table('config_copy_status');
 __PACKAGE__->columns(Primary => 'id');
-__PACKAGE__->columns(Essential => qw/name holdable opac_visible copy_active/);
+__PACKAGE__->columns(Essential => qw/name holdable opac_visible copy_active restrict_copy_delete/);
 #-------------------------------------------------------------------------------
 
 package config::net_access_level;
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 1e9d138..4672bac 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -332,7 +332,8 @@ CREATE TABLE config.copy_status (
 	name		TEXT	NOT NULL UNIQUE,
 	holdable	BOOL	NOT NULL DEFAULT FALSE,
 	opac_visible	BOOL	NOT NULL DEFAULT FALSE,
-    copy_active  BOOL    NOT NULL DEFAULT FALSE
+    copy_active  BOOL    NOT NULL DEFAULT FALSE,
+	restrict_copy_delete BOOL	  NOT NULL DEFAULT FALSE
 );
 COMMENT ON TABLE config.copy_status IS $$
 Copy Statuses
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 1b3d777..220e472 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -295,14 +295,14 @@ INSERT INTO config.rule_age_hold_protect VALUES
 SELECT SETVAL('config.rule_age_hold_protect_id_seq'::TEXT, 100);
 
 INSERT INTO config.copy_status (id,name,holdable,opac_visible,copy_active) VALUES (0,oils_i18n_gettext(0, 'Available', 'ccs', 'name'),'t','t','t');
-INSERT INTO config.copy_status (id,name,holdable,opac_visible,copy_active) VALUES (1,oils_i18n_gettext(1, 'Checked out', 'ccs', 'name'),'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) VALUES (3,oils_i18n_gettext(3, 'Lost', '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) VALUES (6,oils_i18n_gettext(6, 'In transit', '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) VALUES (7,oils_i18n_gettext(7, 'Reshelving', 'ccs', 'name'),'t','t','t');
-INSERT INTO config.copy_status (id,name,holdable,opac_visible,copy_active) VALUES (8,oils_i18n_gettext(8, 'On holds shelf', 'ccs', 'name'),'t','t','t');
+INSERT INTO config.copy_status (id,name,holdable,opac_visible,copy_active,restrict_copy_delete) VALUES (8,oils_i18n_gettext(8, 'On holds shelf', 'ccs', 'name'),'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'));

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

Summary of changes:
 Open-ILS/examples/fm_IDL.xml                       |    1 +
 .../lib/OpenILS/Application/Cat/AssetCommon.pm     |   21 +++++++++----------
 .../lib/OpenILS/Application/Storage/CDBI/config.pm |    2 +-
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    5 ++-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |   12 ++++++----
 ...674.config.copy_status.restrict_copy_delete.sql |   18 ++++++++++++++++
 .../xul/staff_client/server/cat/copy_browser.js    |   22 ++++++++++++++++++-
 .../xul/staff_client/server/cat/copy_buckets.js    |   16 +++----------
 Open-ILS/xul/staff_client/server/cat/util.js       |    9 +++++++-
 .../xul/staff_client/server/circ/copy_status.js    |   15 +++++++++++-
 .../server/locale/en-US/circ.properties            |    1 -
 11 files changed, 85 insertions(+), 37 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0674.config.copy_status.restrict_copy_delete.sql


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list