From bd0fb12047242b4da93fc8f7ff08de4a880f0064 Mon Sep 17 00:00:00 2001
From: dbwells <dbwells@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 1 Dec 2010 13:52:00 +0000
Subject: [PATCH] Assorted small serials fixes

git-svn-id: svn://svn.open-ils.org/ILS/trunk@18895 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/xul/staff_client/server/serial/manage_subs.js    |  2 +-
 Open-ILS/xul/staff_client/server/serial/notes.xul         |  1 -
 Open-ILS/xul/staff_client/server/serial/sdist2_editor.xul |  4 ++--
 Open-ILS/xul/staff_client/server/serial/serctrl_main.xul  | 12 ++++++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Open-ILS/xul/staff_client/server/serial/manage_subs.js b/Open-ILS/xul/staff_client/server/serial/manage_subs.js
index 0e4a51f95a..63de9ff2d7 100644
--- a/Open-ILS/xul/staff_client/server/serial/manage_subs.js
+++ b/Open-ILS/xul/staff_client/server/serial/manage_subs.js
@@ -632,7 +632,7 @@ serial.manage_subs.prototype = {
                                         var robj = obj.network.request(
                                                 'open-ils.serial',
                                                 'open-ils.serial.make_predictions',
-                                                [ ses(), {"ssub_id":list[i], "num_to_predict":num_to_predict, "last_rec_date":"2010-07-07"}]
+                                                [ ses(), {"ssub_id":list[i], "num_to_predict":num_to_predict}]
                                         );
                                         util.functional.map_list(
                                             robj,
diff --git a/Open-ILS/xul/staff_client/server/serial/notes.xul b/Open-ILS/xul/staff_client/server/serial/notes.xul
index 2cfa3f79d2..8f7ae26194 100644
--- a/Open-ILS/xul/staff_client/server/serial/notes.xul
+++ b/Open-ILS/xul/staff_client/server/serial/notes.xul
@@ -191,7 +191,6 @@
 					var r = g.network.simple_request('FM_'+g.function_type+'_CREATE',[ ses(), note ]);
 					if (typeof r.ilsevent != 'undefined') throw(r);
 					setTimeout(function() {
-						alert($('catStrings').getString('staff.cat.copy_notes.new_note.success'));
 						refresh();},0
 					);
 				}
diff --git a/Open-ILS/xul/staff_client/server/serial/sdist2_editor.xul b/Open-ILS/xul/staff_client/server/serial/sdist2_editor.xul
index 91444f25dd..63672ad543 100644
--- a/Open-ILS/xul/staff_client/server/serial/sdist2_editor.xul
+++ b/Open-ILS/xul/staff_client/server/serial/sdist2_editor.xul
@@ -32,8 +32,8 @@
 
 		<hbox id="sdist2_editor_nav">
 			<spacer flex="1"/>
-			<button id="sdist2_notes" label="&staff.serial.sdist_editor.notes;" accesskey="&staff.serial.sdist_editor.notes.accesskey;" oncommand="g.manage_dists.sdist2_editor.notes()" />
-			<button id="sdist2_save" label="&staff.serial.sdist_editor.modify;" hidden="true" accesskey="&staff.serial.ssub_editor.modify.accesskey;" oncommand="g.manage_dists.sdist2_editor.save()" />
+			<button id="sdist2_notes" label="&staff.serial.sdist_editor.notes;" accesskey="&staff.serial.sdist_editor.notes.accesskey;" oncommand="g.manage_dists.sdist_editor.notes()" />
+			<button id="sdist2_save" label="&staff.serial.sdist_editor.modify;" hidden="true" accesskey="&staff.serial.ssub_editor.modify.accesskey;" oncommand="g.manage_dists.sdist_editor.save()" />
 			<!--<button id="cancel" label="&staff.cat.copy_editor.cancel.label;" accesskey="&staff.cat.copy_editor.cancel.accesskey;" oncommand="window.close();"/>-->
 		</hbox>
 
diff --git a/Open-ILS/xul/staff_client/server/serial/serctrl_main.xul b/Open-ILS/xul/staff_client/server/serial/serctrl_main.xul
index f20d688bff..0fe7d21603 100644
--- a/Open-ILS/xul/staff_client/server/serial/serctrl_main.xul
+++ b/Open-ILS/xul/staff_client/server/serial/serctrl_main.xul
@@ -23,6 +23,7 @@ vim:noet:sw=4:ts=4:
 <?xul-overlay href="/xul/server/OpenILS/util_overlay.xul"?>
 <?xul-overlay href="/xul/server/serial/manage_items.xul"?>
 <?xul-overlay href="/xul/server/serial/manage_subs.xul"?>
+<?xul-overlay href="/xul/server/serial/manage_dists.xul"?>
 
 <window id="serial_serctrl_main" 
 	onload="try { my_init(); font_helper(); persist_helper(); } catch(E) { alert(E); }"
@@ -47,6 +48,7 @@ vim:noet:sw=4:ts=4:
 		<command id="cmd_add_scap"/>
 		<command id="cmd_add_sdist"/>
 		<command id="cmd_add_siss"/>
+		<command id="cmd_add_sstr"/>
 		<command id="cmd_add_subscriptions"/>
 		<command id="cmd_broken" />
 		<command id="cmd_clear" />
@@ -54,14 +56,17 @@ vim:noet:sw=4:ts=4:
         <command id="cmd_edit_sdists"/>
         <command id="cmd_edit_subscriptions"/>
 		<command id="cmd_edit_sunit"/>
+		<command id="cmd_edit_sstr"/>
 		<command id="cmd_delete_items"/>
 		<command id="cmd_delete_scap"/>
 		<command id="cmd_delete_sdist"/>
 		<command id="cmd_delete_siss"/>
+        <command id="cmd_delete_sstr"/>
         <command id="cmd_delete_ssub"/>
         <command id="cmd_make_predictions"/>
         <command id="cmd_mark_library"/>
         <command id="cmd_mark_subscription"/>
+        <command id="cmd_mark_sdist"/>
 		<command id="cmd_predict_items"/>
 		<command id="cmd_print_spine_labels"/>
 		<command id="cmd_receive_items"/>
@@ -74,13 +79,12 @@ vim:noet:sw=4:ts=4:
         <command id="cmd_show_my_libs" />
 		<command id="cmd_transfer_items"/>
         <command id="cmd_transfer_sdists"/>
+        <command id="cmd_transfer_sstrs"/>
         <command id="cmd_transfer_subscription"/>
 		<command id="save_columns" />
 		<command id="sel_clip" />
 		<command id="sel_mark_items_damaged" />
 		<command id="sel_mark_items_missing" />
-        <command id="sel_mark_sdists_damaged" />
-        <command id="sel_mark_sdists_missing" />
 	</commandset>
 
 	<!--<popupset>
@@ -106,14 +110,14 @@ vim:noet:sw=4:ts=4:
             <tabs>
                 <tab label="Items" />
                 <tab label="Units" />
-                <tab label="Distributions" />
+                <tab id="serial_manage_dists_tab" label="Distributions" />
                 <tab id="serial_manage_subs_tab" label="Subscriptions" />
                 <tab label="Claims" />
             </tabs>
             <tabpanels flex="1">
                 <tabpanel id="serial_manage_items" />
                 <tabpanel id="serial_manage_units"><description>This tab will contain an alternative unit view/editor.</description></tabpanel>
-                <tabpanel id="serial_manage_distributions"><description>This tab will contain a tree of distributions with editors for templates, summaries, and streams.</description></tabpanel>
+                <tabpanel id="serial_manage_dists" />
                 <tabpanel id="serial_manage_subs" />
                 <tabpanel id="serial_manage_claims"><description>This tab will contain a claims interface.</description></tabpanel>
             </tabpanels>
-- 
2.11.0