From 9f9dff69698e762d7e1c3d0d0acc5d26b12327d0 Mon Sep 17 00:00:00 2001 From: phasefx Date: Tue, 29 Dec 2009 16:28:44 +0000 Subject: [PATCH] Replace ui.circ_and_cat.notes.require_initials and ui.circ.standing_penalty.require_initials org unit settings with a single ui.staff.require_initials setting. 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 --- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 11 +++-------- .../upgrade/0117.data.org-setting-notes-require-initials.sql | 4 ++-- Open-ILS/xul/staff_client/server/cat/copy_notes.xul | 2 +- .../xul/staff_client/server/patron/edit_standing_penalty.js | 2 +- Open-ILS/xul/staff_client/server/patron/info_notes.xul | 2 +- .../xul/staff_client/server/patron/new_standing_penalty.js | 2 +- 6 files changed, 9 insertions(+), 14 deletions(-) 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 770979273..6ef8a554c 100644 --- 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 9bb2d0711..4463e92d1 100644 --- 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 855dcd1ba..b27cb81f3 100644 --- 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 @@ \ \ '; - 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 += ''; } 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 4d22dae23..8aad0331a 100644 --- 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 988b18f7c..589e86917 100644 --- 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 += '