Merge branch 'master' of git.evergreen-ils.org:Evergreen into kids-opac

diff --cc Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
Simple merge

diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
index f394110,4478d7a..6f4e9fa
--- 1/Open-ILS/src/sql/Pg/950.data.seed-values.sql
--- 2/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@@ -11590,35 -11611,25 +11611,56 @@@ INSERT INTO config.org_unit_setting_typ
          'gui'
      );
  
+ INSERT into config.org_unit_setting_type 
+     (name, grp, label, description, datatype) 
+     VALUES ( 
+         'opac.patron.auto_overide_hold_events', 
+         'opac',
+         oils_i18n_gettext(
+             'opac.patron.auto_overide_hold_events',
+             'Auto-Override Permitted Hold Blocks (Patrons)',
+             'coust', 
+             'label'
+         ),
+         oils_i18n_gettext(
+             'opac.patron.auto_overide_hold_events',
+             'When a patron places a hold that fails and the patron has the correct permission ' || 
+             'to override the hold, automatically override the hold without presenting a message ' || 
+             'to the patron and requiring that the patron make a decision to override',
+             'coust', 
+             'description'
+         ),
+         'bool'
+     );
  
 +
 +-- kid's opac main search filter
 +
 +INSERT INTO actor.search_filter_group (owner, code, label) 
 +    VALUES (1, 'kpac_main', 'Kid''s OPAC Search Filter');
 +
 +INSERT INTO actor.search_query (label, query_text) 
 +    VALUES ('Children''s Materials', 'audience(a,b,c)');
 +INSERT INTO actor.search_query (label, query_text) 
 +    VALUES ('Young Adult Materials', 'audience(j,d)');
 +INSERT INTO actor.search_query (label, query_text) 
 +    VALUES ('General/Adult Materials',  'audience(e,f,g, )');
 +
 +INSERT INTO actor.search_filter_group_entry (grp, query, pos)
 +    VALUES (
 +        (SELECT id FROM actor.search_filter_group WHERE code = 'kpac_main'),
 +        (SELECT id FROM actor.search_query WHERE label = 'Children''s Materials'),
 +        0
 +    );
 +INSERT INTO actor.search_filter_group_entry (grp, query, pos) 
 +    VALUES (
 +        (SELECT id FROM actor.search_filter_group WHERE code = 'kpac_main'),
 +        (SELECT id FROM actor.search_query WHERE label = 'Young Adult Materials'),
 +        1
 +    );
 +INSERT INTO actor.search_filter_group_entry (grp, query, pos) 
 +    VALUES (
 +        (SELECT id FROM actor.search_filter_group WHERE code = 'kpac_main'),
 +        (SELECT id FROM actor.search_query WHERE label = 'General/Adult Materials'),
 +        2
 +    );