[open-ils-commits] r15240 - in trunk/Open-ILS: src/sql/Pg src/sql/Pg/upgrade xul/staff_client/server/cat xul/staff_client/server/patron (phasefx)
svn at svn.open-ils.org
svn at svn.open-ils.org
Tue Dec 29 11:28:47 EST 2009
Author: phasefx
Date: 2009-12-29 11:28:44 -0500 (Tue, 29 Dec 2009)
New Revision: 15240
Modified:
trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
trunk/Open-ILS/src/sql/Pg/upgrade/0117.data.org-setting-notes-require-initials.sql
trunk/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
trunk/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js
trunk/Open-ILS/xul/staff_client/server/patron/info_notes.xul
trunk/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js
Log:
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' );
Modified: trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql 2009-12-29 16:06:55 UTC (rev 15239)
+++ trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql 2009-12-29 16:28:44 UTC (rev 15240)
@@ -1719,16 +1719,11 @@
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'),
+( '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.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'),
- 'bool' ),
-
( 'ui.general.button_bar',
'Button bar',
null,
Modified: trunk/Open-ILS/src/sql/Pg/upgrade/0117.data.org-setting-notes-require-initials.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0117.data.org-setting-notes-require-initials.sql 2009-12-29 16:06:55 UTC (rev 15239)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0117.data.org-setting-notes-require-initials.sql 2009-12-29 16:28:44 UTC (rev 15240)
@@ -4,8 +4,8 @@
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;
Modified: trunk/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/copy_notes.xul 2009-12-29 16:06:55 UTC (rev 15239)
+++ trunk/Open-ILS/xul/staff_client/server/cat/copy_notes.xul 2009-12-29 16:28:44 UTC (rev 15240)
@@ -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>';
}
Modified: trunk/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js 2009-12-29 16:06:55 UTC (rev 15239)
+++ trunk/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.js 2009-12-29 16:28:44 UTC (rev 15240)
@@ -24,7 +24,7 @@
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;
}
Modified: trunk/Open-ILS/xul/staff_client/server/patron/info_notes.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/info_notes.xul 2009-12-29 16:06:55 UTC (rev 15239)
+++ trunk/Open-ILS/xul/staff_client/server/patron/info_notes.xul 2009-12-29 16:28:44 UTC (rev 15240)
@@ -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>';
}
Modified: trunk/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js 2009-12-29 16:06:55 UTC (rev 15239)
+++ trunk/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.js 2009-12-29 16:28:44 UTC (rev 15240)
@@ -24,7 +24,7 @@
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;
}
More information about the open-ils-commits
mailing list