Replace ui.circ_and_cat.notes.require_initials and ui.circ.standing_penalty.require_i...

For those running trunk, re-run Open-ILS/src/sql/Pg/upgrade/0117.data.org-setting-notes-require-initials.sql

Also,

DELETE FROM actor.org_unit_setting WHERE name IN ( 'ui.circ_and_cat.notes.require_initials', 'ui.circ.standing_penalty.require_initials' );
DELETE FROM config.org_unit_setting_type WHERE name IN ( 'ui.circ_and_cat.notes.require_initials', 'ui.circ.standing_penalty.require_initials' );

git-svn-id: svn://svn.open-ils.org/ILS/trunk@15240 dcc99617-32d9-48b4-a31d-7c20da2025e4

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 7709792..6ef8a55 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1719,14 +1719,9 @@ INSERT into config.org_unit_setting_type
   null,
   'bool' ),
 
-( 'ui.circ.standing_penalty.require_initials',
-  oils_i18n_gettext('ui.circ.standing_penalty.require_initials', 'GUI: Require staff initials for entry/edit of standing penalties.', 'coust', 'label'),
-  oils_i18n_gettext('ui.circ.standing_penalty.require_initials', 'Appends staff initials and edit date into penalty note.', 'coust', 'description'),
-  'bool' ),
-
-( 'ui.circ_and_cat.notes.require_initials',
-  oils_i18n_gettext('ui.circ_and_cat.notes.require_initials', 'GUI: Require staff initials for entry/edit of item and patron notes.', 'coust', 'label'),
-  oils_i18n_gettext('ui.circ_and_cat.notes.require_initials', 'Appends staff initials and edit date into note content.', 'coust', 'description'),
+( 'ui.staff.require_initials',
+  oils_i18n_gettext('ui.staff.require_initials', 'GUI: Require staff initials for entry/edit of item and patron notes.', 'coust', 'label'),
+  oils_i18n_gettext('ui.staff.require_initials', 'Appends staff initials and edit date into note content.', 'coust', 'description'),
   'bool' ),
 
 ( 'ui.general.button_bar',

diff --git a/Open-ILS/src/sql/Pg/upgrade/0117.data.org-setting-notes-require-initials.sql b/Open-ILS/src/sql/Pg/upgrade/0117.data.org-setting-notes-require-initials.sql
index 9bb2d07..4463e92 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0117.data.org-setting-notes-require-initials.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0117.data.org-setting-notes-require-initials.sql
@@ -4,8 +4,8 @@ INSERT INTO config.upgrade_log (version) VALUES ('0117'); -- phasefx
 
 INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) VALUES 
 ( 'ui.circ_and_cat.notes.require_initials',
-  oils_i18n_gettext('ui.circ_and_cat.notes.require_initials', 'GUI: Require staff initials for entry/edit of item and patron notes.', 'coust', 'label'),
-  oils_i18n_gettext('ui.circ_and_cat.notes.require_initials', 'Appends staff initials and edit date into note content.', 'coust', 'description'),
+  oils_i18n_gettext('ui.staff.require_initials', 'GUI: Require staff initials for entry/edit of item/patron/penalty notes/messages.', 'coust', 'label'),
+  oils_i18n_gettext('ui.staff.require_initials', 'Appends staff initials and edit date into note content.', 'coust', 'description'),
   'bool' );
 
 COMMIT;

diff --git a/Open-ILS/xul/staff_client/server/cat/copy_notes.xul b/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
index 855dcd1..b27cb81 100644 (file)
--- a/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
@@ -160,7 +160,7 @@
                             <row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.public') + '"/><checkbox id="pub" name="fancy_data" checked="false"/></row> \
                             <row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.title') + '"/><textbox id="title" name="fancy_data" context="clipboard"/></row> \
                             <row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.note') + '"/><textbox multiline="true" id="note" name="fancy_data" context="clipboard"/></row>';
-                var show_initials = String( g.data.hash.aous['ui.circ_and_cat.notes.require_initials'] ) == 'true';
+                var show_initials = String( g.data.hash.aous['ui.staff.require_initials'] ) == 'true';
                 if (show_initials) {
                     xml += '<row><label value="'+$("catStrings").getString('staff.cat.copy_notes.new_note.initials')+'"/><textbox id="initials" name="fancy_required_data" context="clipboard"/></row>';
                 }

diff --git a/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js b/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js
index 4d22dae..8aad033 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js
+++ b/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js
@@ -24,7 +24,7 @@ function edit_penalty_init() {
 
         build_penalty_menu();
 
-        var show_initials = String( data.hash.aous['ui.circ.standing_penalty.require_initials'] ) == 'true';
+        var show_initials = String( data.hash.aous['ui.staff.require_initials'] ) == 'true';
         if (show_initials) {
             document.getElementById('initials_box').hidden = false;
         }

diff --git a/Open-ILS/xul/staff_client/server/patron/info_notes.xul b/Open-ILS/xul/staff_client/server/patron/info_notes.xul
index 988b18f..589e869 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/info_notes.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_notes.xul
@@ -192,7 +192,7 @@
                 xml += '<label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.patron_visible.value')+'"/><checkbox id="pub" name="fancy_data"/></row>';
                 xml += '<row><label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.title.value')+'"/><textbox id="title" name="fancy_data" context="clipboard"/></row>';
                 xml += '<row><label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.note.value')+'"/><textbox multiline="true" id="note" name="fancy_data" context="clipboard"/></row>';
-                var show_initials = String( g.data.hash.aous['ui.circ_and_cat.notes.require_initials'] ) == 'true';
+                var show_initials = String( g.data.hash.aous['ui.staff.require_initials'] ) == 'true';
                 if (show_initials) {
                     xml += '<row><label value="'+$("patronStrings").getString('staff.patron.info_notes.new_note.initials.value')+'"/><textbox id="initials" name="fancy_required_data" context="clipboard"/></row>';
                 }

diff --git a/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js b/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js
index a49cac7..fd9d064 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js
+++ b/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js
@@ -24,7 +24,7 @@ function new_penalty_init() {
 
         build_penalty_menu();
 
-        var show_initials = String( data.hash.aous['ui.circ.standing_penalty.require_initials'] ) == 'true';
+        var show_initials = String( data.hash.aous['ui.staff.require_initials'] ) == 'true';
         if (show_initials) {
             document.getElementById('initials_box').hidden = false;
         }