[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. 3a01d737895a1eee4088f2254d0d71e66c758e72

[Evergreen Git]

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  3a01d737895a1eee4088f2254d0d71e66c758e72 (commit)
      from  ed34006457b33125462332a37df73eced5a0f5de (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 3a01d737895a1eee4088f2254d0d71e66c758e72
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Tue Oct 15 09:33:46 2013 -0400

    Serial alert notes missing commit
    
    These changes were somehow lost during the hacking on this feature
    at the Hack-a-Way.  The translation string is nice, but the changes
    to notes.xul are necessary for being able to create notes.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/serial.properties b/Open-ILS/xul/staff_client/server/locale/en-US/serial.properties
index bf4e631..14c16bb 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/serial.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/serial.properties
@@ -70,6 +70,7 @@ staff.serial.manage_items.notes_column.label=Notes (Item/Dist/Sub)
 staff.serial.manage_items.set_claimed_success=Successfully claimed %1$s item(s)
 staff.serial.manage_items.set_not_held_success=Successfully set %1$s item(s) to 'Not Held'
 staff.serial.manage_items.set_not_published_success=Successfully set %1$s item(s) to 'Not Published'
+staff.serial.manage_items.alert_notes.title=Serial Alerts
 staff.serial.manage_items.alert_button.label=1 Alert
 staff.serial.manage_items.alert_button.plural.label=%1s Alerts
 staff.serial.manage_subs.add.error=error adding object in manage_subs.js:
diff --git a/Open-ILS/xul/staff_client/server/serial/manage_items.js b/Open-ILS/xul/staff_client/server/serial/manage_items.js
index 696d819..3a760f7 100644
--- a/Open-ILS/xul/staff_client/server/serial/manage_items.js
+++ b/Open-ILS/xul/staff_client/server/serial/manage_items.js
@@ -1219,7 +1219,7 @@ serial.manage_items.prototype = {
         var notes_window = win.open(
             urls.XUL_SERIAL_NOTES,
             '','chrome,resizable,modal',
-            { 'notes' : notes, 'section_titles' : section_titles, 'title' : "Serial Alerts", 'disable_create' : true, 'section_id_names' : { 'ssubn' : 'subscription', 'sdistn' : 'distribution', 'sin' : 'item'} }
+            { 'notes' : notes, 'section_titles' : section_titles, 'title' : $('serialStrings').getString('staff.serial.manage_items.alert_notes.title'), 'disable_create' : true, 'section_id_names' : { 'ssubn' : 'subscription', 'sdistn' : 'distribution', 'sin' : 'item'} }
         );
         if (notes_window.notes_updated) { // we changed some notes
             if (notes_window.notes_updated.sdistn || notes_window.notes_updated.ssubn) {
diff --git a/Open-ILS/xul/staff_client/server/serial/notes.xul b/Open-ILS/xul/staff_client/server/serial/notes.xul
index d6ec108..7e12c62 100644
--- a/Open-ILS/xul/staff_client/server/serial/notes.xul
+++ b/Open-ILS/xul/staff_client/server/serial/notes.xul
@@ -246,6 +246,7 @@
 			var edit_mode; // for clarity
 			var label_text;
 			var button_accesskey;
+			var note_fm_type;
 
 			if (typeof index != 'undefined') {
 				edit_mode = true;
@@ -253,9 +254,11 @@
 				alert = get_bool(g.notes[index].alert());
 				title = xml_encode(g.notes[index].title());
 				value = xml_encode(g.notes[index].value());
+				note_fm_type = g.notes[index].classname;
 				label_text = $('serialStrings').getString('staff.serial.notes.edit_note.label');
 				button_accesskey = $('serialStrings').getString('staff.serial.notes.edit_note.accesskey');
 			} else {
+				note_fm_type = g.fm_type;
 				label_text = $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.label');
 				button_accesskey = $('catStrings').getString('staff.cat.copy_notes.new_note.add_note.accesskey');
 			}
@@ -267,7 +270,7 @@
 					<grid flex="1"><columns><column/><column flex="1"/></columns> \
 						<rows> \
 							<row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.public') + '"/><checkbox id="pub" name="fancy_data" checked="' + public + '"/></row> \
-							<row><label value="' + fieldmapper.IDL.fmclasses[g.notes[index].classname].field_map.alert.label + '"/><checkbox id="alert" name="fancy_data" checked="' + alert + '"/></row> \
+							<row><label value="' + fieldmapper.IDL.fmclasses[note_fm_type].field_map.alert.label + '"/><checkbox id="alert" name="fancy_data" checked="' + alert + '"/></row> \
 							<row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.title') + '"/><textbox id="title" name="fancy_data" context="clipboard" value="' + title + '"/></row> \
 							<row><label value="' + $('catStrings').getString('staff.cat.copy_notes.new_note.note') + '"/><textbox multiline="true" id="note" name="fancy_data" context="clipboard" value="' + value + '"/></row> \
 							<row><spacer/><hbox> \

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

Summary of changes:
 .../server/locale/en-US/serial.properties          |    1 +
 .../xul/staff_client/server/serial/manage_items.js |    2 +-
 Open-ILS/xul/staff_client/server/serial/notes.xul  |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS