[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. bd8c274bd9680461f5df7e20fe8121ce8fe9ce72
Evergreen Git
git at git.evergreen-ils.org
Wed Apr 25 16:29:48 EDT 2012
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, rel_2_2 has been updated
via bd8c274bd9680461f5df7e20fe8121ce8fe9ce72 (commit)
via e644726e69cc83827abc3bc9560eac13e4e902a3 (commit)
via 53d9790901432f2e6343010b4275efa4a5c59c9e (commit)
via 9f8e12a96067505b7bf151a2355f8a7cb5925bc4 (commit)
from fc557f7d63e51ce566e9d03c219e8c4eea1d23d6 (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 bd8c274bd9680461f5df7e20fe8121ce8fe9ce72
Author: Dan Wells <dbw2 at calvin.edu>
Date: Tue Apr 17 16:48:43 2012 -0400
Clean up and refine serial note support, part 3
Add needed menu entries for invoking the serial notes editor from
the list in the Items tab.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index e9385dd..fd3e752 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1730,10 +1730,16 @@
<!ENTITY staff.serial.manage_dists.actions.cmd_add_sstr.label "Add Stream">
<!ENTITY staff.serial.manage_dists.actions.cmd_delete_sstr.label "Delete Stream">
<!ENTITY staff.serial.manage_items.actions.cmd_edit_items.label "Edit Item Attributes">
-<!ENTITY staff.serial.manage_items.actions.cmd_edit_items.access_key "E">
+<!ENTITY staff.serial.manage_items.actions.cmd_edit_items.accesskey "E">
<!ENTITY staff.serial.manage_items.actions.cmd_delete_items.label "Delete Items">
-<!ENTITY staff.serial.manage_items.actions.cmd_delete_items.access_key "D">
+<!ENTITY staff.serial.manage_items.actions.cmd_delete_items.accesskey "D">
<!ENTITY staff.serial.manage_items.actions.cmd_reset_items.label "Reset Items to Expected">
+<!ENTITY staff.serial.manage_items.actions.cmd_view_sdist_notes.label "View Dist. Notes">
+<!ENTITY staff.serial.manage_items.actions.cmd_view_sdist_notes.accesskey "T">
+<!ENTITY staff.serial.manage_items.actions.cmd_view_sitem_notes.label "View Item Notes">
+<!ENTITY staff.serial.manage_items.actions.cmd_view_sitem_notes.accesskey "I">
+<!ENTITY staff.serial.manage_items.actions.cmd_view_ssub_notes.label "View Sub. Notes">
+<!ENTITY staff.serial.manage_items.actions.cmd_view_ssub_notes.accesskey "S">
<!ENTITY staff.serial.manage_items.workarea_showing "Showing: ">
<!ENTITY staff.serial.manage_items.workarea_current_unit "Current Working Unit: ">
<!ENTITY staff.serial.manage_items.workarea_recently_received "Recently Received">
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 30f348f..917dd68 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
@@ -66,6 +66,7 @@ staff.serial.manage_dists.delete_sstr.title=Delete Streams?
staff.serial.manage_dists.delete_sstr.override=Override Delete Failure? Doing so will delete all attached items as well!
staff.serial.manage_items.subscriber.label=Subscriber
staff.serial.manage_items.holder.label=Holder
+staff.serial.manage_items.notes_column.label=Notes (Item/Dist/Sub)
staff.serial.manage_subs.add.error=error adding object in manage_subs.js:
staff.serial.manage_subs.delete.error=error deleting object in manage_subs.js:
staff.serial.manage_subs.delete_scap.confirm=Are you sure you would like to delete this caption and pattern?
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 acaae8c..5e5e449 100644
--- a/Open-ILS/xul/staff_client/server/serial/manage_items.js
+++ b/Open-ILS/xul/staff_client/server/serial/manage_items.js
@@ -524,7 +524,36 @@ serial.manage_items.prototype = {
}
}
],
-
+ 'cmd_view_sitem_notes' : [
+ ['command'],
+ function() {
+ try {
+ obj.view_notes('sitem');
+ } catch(E) {
+ obj.error.standard_unexpected_error_alert('cmd_view_sitem_notes failed!',E);
+ }
+ }
+ ],
+ 'cmd_view_sdist_notes' : [
+ ['command'],
+ function() {
+ try {
+ obj.view_notes('sdist');
+ } catch(E) {
+ obj.error.standard_unexpected_error_alert('cmd_view_sdist_notes failed!',E);
+ }
+ }
+ ],
+ 'cmd_view_ssub_notes' : [
+ ['command'],
+ function() {
+ try {
+ obj.view_notes('ssub');
+ } catch(E) {
+ obj.error.standard_unexpected_error_alert('cmd_view_ssub_notes failed!',E);
+ }
+ }
+ ],
'cmd_items_print' : [ ['command'], function() { obj.items_print(obj.selected_list); } ],
'cmd_items_export' : [ ['command'], function() { obj.items_export(obj.selected_list); } ],
'cmd_refresh_list' : [ ['command'], function() { obj.retrieve_ssubs_and_sdists(); obj.refresh_list('main'); obj.refresh_list('workarea'); } ]
@@ -935,6 +964,66 @@ serial.manage_items.prototype = {
obj.refresh_list('main');
obj.refresh_list('workarea');
}
+ },
+
+ 'view_notes' : function(type) {
+ var obj = this;
+
+ if (!obj.retrieve_ids || obj.retrieve_ids.length == 0) return;
+
+ var object_id_fn;
+ var function_type;
+ var object_type;
+ var constructor;
+
+ switch(type) {
+ case 'sitem':
+ object_id_fn = function(item) { return item.id() };
+ title_fn = function(item) { return fieldmapper.IDL.fmclasses.sitem.field_map.id.label + ' ' + item.id() };
+ function_type = 'SIN';
+ object_type = 'item';
+ constructor = sin;
+ break;
+ case 'sdist':
+ object_id_fn = function(item) { return item.stream().distribution() };
+ title_fn = function(item) {
+ var sdist_id = object_id_fn(item);
+ return obj.sdist_map[sdist_id].label()
+ + ' -- ' + obj.sdist_map[sdist_id].holding_lib().shortname()
+ + ' (' + fieldmapper.IDL.fmclasses.sdist.field_map.id.label + ' ' + sdist_id + ')'
+ };
+ function_type = 'SDISTN';
+ object_type = 'distribution';
+ constructor = sdistn;
+ break;
+ case 'ssub':
+ object_id_fn = function(item) { return item.issuance().subscription().id() };
+ title_fn = function(item) {
+ var ssub_id = object_id_fn(item);
+ return obj.ssub_map[ssub_id].owning_lib().shortname()
+ + ' (' + fieldmapper.IDL.fmclasses.ssub.field_map.id.label + ' ' + ssub_id + ')'
+ };
+ function_type = 'SSUBN';
+ object_type = 'subscription';
+ constructor = ssubn;
+ break;
+ default:
+ return;
+ }
+
+ var seen_ids = {};
+ for (var i = 0; i < obj.retrieve_ids.length; i++) {
+ var item = obj.list_sitem_map[obj.retrieve_ids[i].sitem_id];
+ var obj_id = object_id_fn(item);
+ if (seen_ids[obj_id]) continue;
+ JSAN.use('util.window'); var win = new util.window();
+ win.open(
+ urls.XUL_SERIAL_NOTES,
+ '','chrome,resizable,modal',
+ { 'object_id' : obj_id, 'function_type' : function_type, 'object_type' : object_type, 'constructor' : constructor, 'title' : $('serialStrings').getString('staff.serial.'+type+'_editor.notes') + ' -- ' + title_fn(item) }
+ );
+ seen_ids[obj_id] = 1;
+ }
}
}
@@ -1018,11 +1107,11 @@ function item_columns(modify,params) {
},
{
'id' : 'notes',
- 'label' : 'Notes',
+ 'label' : $('serialStrings').getString('staff.serial.manage_items.notes_column.label'),
'flex' : 1,
'primary' : false,
'hidden' : false,
- 'render' : function(my) { return my.sitem.notes().length; },
+ 'render' : function(my) { return my.sitem.notes().length + ' / ' + my.parent_obj.sdist_map[my.sitem.stream().distribution()].notes().length + ' / ' + my.parent_obj.ssub_map[my.sitem.issuance().subscription().id()].notes().length; },
'persist' : 'hidden width ordinal'
},
{
diff --git a/Open-ILS/xul/staff_client/server/serial/manage_items.xul b/Open-ILS/xul/staff_client/server/serial/manage_items.xul
index c5bedca..b8f8115 100644
--- a/Open-ILS/xul/staff_client/server/serial/manage_items.xul
+++ b/Open-ILS/xul/staff_client/server/serial/manage_items.xul
@@ -43,6 +43,9 @@ vim:noet:sw=4:ts=4:
<menuitem command="cmd_edit_items" label="&staff.serial.manage_items.actions.cmd_edit_items.label;" accesskey="&staff.serial.manage_items.actions.cmd_edit_items.accesskey;"/>
<menuitem command="cmd_reset_items" label="&staff.serial.manage_items.actions.cmd_reset_items.label;" />
<menuitem command="cmd_delete_items" label="&staff.serial.manage_items.actions.cmd_delete_items.label;" accesskey="&staff.serial.manage_items.actions.cmd_delete_items.accesskey;"/>
+ <menuitem command="cmd_view_sitem_notes" label="&staff.serial.manage_items.actions.cmd_view_sitem_notes.label;" accesskey="&staff.serial.manage_items.actions.cmd_view_sitem_notes.accesskey;"/>
+ <menuitem command="cmd_view_sdist_notes" label="&staff.serial.manage_items.actions.cmd_view_sdist_notes.label;" accesskey="&staff.serial.manage_items.actions.cmd_view_sdist_notes.accesskey;"/>
+ <menuitem command="cmd_view_ssub_notes" label="&staff.serial.manage_items.actions.cmd_view_ssub_notes.label;" accesskey="&staff.serial.manage_items.actions.cmd_view_ssub_notes.accesskey;"/>
</popup>
</popupset>
<tabpanel id="serial_manage_items" orient="vertical" flex="1">
@@ -67,6 +70,9 @@ vim:noet:sw=4:ts=4:
<menuitem command="cmd_edit_items" label="&staff.serial.manage_items.actions.cmd_edit_items.label;" accesskey="&staff.serial.manage_items.actions.cmd_edit_items.accesskey;"/>
<menuitem command="cmd_reset_items" label="&staff.serial.manage_items.actions.cmd_reset_items.label;" />
<menuitem command="cmd_delete_items" label="&staff.serial.manage_items.actions.cmd_delete_items.label;" accesskey="&staff.serial.manage_items.actions.cmd_delete_items.accesskey;"/>
+ <menuitem command="cmd_view_sitem_notes" label="&staff.serial.manage_items.actions.cmd_view_sitem_notes.label;" accesskey="&staff.serial.manage_items.actions.cmd_view_sitem_notes.accesskey;"/>
+ <menuitem command="cmd_view_sdist_notes" label="&staff.serial.manage_items.actions.cmd_view_sdist_notes.label;" accesskey="&staff.serial.manage_items.actions.cmd_view_sdist_notes.accesskey;"/>
+ <menuitem command="cmd_view_ssub_notes" label="&staff.serial.manage_items.actions.cmd_view_ssub_notes.label;" accesskey="&staff.serial.manage_items.actions.cmd_view_ssub_notes.accesskey;"/>
<menuseparator/>
<menuitem command="cmd_refresh_list" label="&staff.cat.copy_browser.holdings_maintenance.cmd_refresh_list.label;" accesskey="&staff.cat.copy_browser.holdings_maintenance.cmd_refresh_list.accesskey;"/>
<menuitem command="save_columns" label="&staff.cat.copy_browser.holdings_maintenance.save_columns.label;"/>
diff --git a/Open-ILS/xul/staff_client/server/serial/notes.xul b/Open-ILS/xul/staff_client/server/serial/notes.xul
index 2009de6..3866802 100644
--- a/Open-ILS/xul/staff_client/server/serial/notes.xul
+++ b/Open-ILS/xul/staff_client/server/serial/notes.xul
@@ -58,6 +58,11 @@
g.function_type = xul_param('function_type',{'modal_xulG':true});
g.constructor = xul_param('constructor',{'modal_xulG':true});
+ var window_title = xul_param('title',{'modal_xulG':true});
+ if (window_title) {
+ try { document.title = window_title; } catch(E) {}
+ }
+
refresh();
} catch(E) {
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 4448794..cde4abe 100644
--- a/Open-ILS/xul/staff_client/server/serial/serctrl_main.xul
+++ b/Open-ILS/xul/staff_client/server/serial/serctrl_main.xul
@@ -83,6 +83,9 @@ vim:noet:sw=4:ts=4:
<command id="cmd_transfer_sdists"/>
<command id="cmd_transfer_sstrs"/>
<command id="cmd_transfer_subscription"/>
+ <command id="cmd_view_sdist_notes"/>
+ <command id="cmd_view_sitem_notes"/>
+ <command id="cmd_view_ssub_notes"/>
<command id="save_columns" />
<command id="sel_clip" />
<command id="sel_mark_items_damaged" />
commit e644726e69cc83827abc3bc9560eac13e4e902a3
Author: Dan Wells <dbw2 at calvin.edu>
Date: Tue Apr 17 17:35:26 2012 -0400
Clean up and refine serial note support, part 2
Because of the way our notes are being rendered, a handful of
special XML characters can break the note interface when editing.
These characters are now properly encoded as entities.
Also, editing of newlines presents a similar issue with different
consequences, and it is handled similarly but separately.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/xul/staff_client/server/serial/notes.xul b/Open-ILS/xul/staff_client/server/serial/notes.xul
index bb6ce84..2009de6 100644
--- a/Open-ILS/xul/staff_client/server/serial/notes.xul
+++ b/Open-ILS/xul/staff_client/server/serial/notes.xul
@@ -171,6 +171,10 @@
}
+ function xml_encode(str) {
+ return str.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"').replace(/'/g, ''');
+ }
+
function new_note(index) {
var public = false;
var title = '';
@@ -182,8 +186,8 @@
if (typeof index != 'undefined') {
edit_mode = true;
public = get_bool(g.notes[index].pub());
- title = g.notes[index].title();
- value = g.notes[index].value();
+ title = xml_encode(g.notes[index].title());
+ value = xml_encode(g.notes[index].value());
label_text = $('serialStrings').getString('staff.serial.notes.edit_note.label');
button_accesskey = $('serialStrings').getString('staff.serial.notes.edit_note.accesskey');
} else {
@@ -193,6 +197,7 @@
try {
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect UniversalBrowserWrite");
+ value = value.replace(/\n/g, " "); // preserve newlines
var xml = '<groupbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" flex="1"> \
<caption label="' + label_text + '"/> \
<grid flex="1"><columns><column/><column flex="1"/></columns> \
commit 53d9790901432f2e6343010b4275efa4a5c59c9e
Author: Dan Wells <dbw2 at calvin.edu>
Date: Tue Apr 17 17:34:06 2012 -0400
Clean up and refine serial note support, part 1
This commit fixes a number of minor problems with serial notes:
1) Serial notes are currently returned in "random" (database)
order. Adding a create_date sort is a sensible default.
2) If you have many notes, they start to display in a squashed and
unreadable fashion. Switching from a groupbox to a styled vbox
provides a simple workaround.
3) It is currently impossible to display newlines in notes. We can
deal with this by changing the display style.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
index 6d645ae..377069d 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
@@ -65,6 +65,11 @@ my %MFHD_TAGS_BY_NAME = ( $MFHD_NAMES[0] => '853',
$MFHD_NAMES[1] => '854',
$MFHD_NAMES[2] => '855');
my $_strp_date = new DateTime::Format::Strptime(pattern => '%F');
+my %FM_NAME_TO_ID = (
+ 'subscription' => 'ssub',
+ 'distribution' => 'sdist',
+ 'item' => 'sitem'
+ );
# helper method for conforming dates to ISO8601
sub _cleanse_dates {
@@ -1947,18 +1952,19 @@ sub fetch_notes {
my $id = $$args{object_id};
my $authtoken = $$args{authtoken};
+ my $order_by = $$args{order_by} || 'create_date';
my( $r, $evt);
if( $$args{pub} ) {
return $U->cstorereq(
'open-ils.cstore.direct.serial.'.$type.'_note.search.atomic',
- { $type => $id, pub => 't' } );
+ { $type => $id, pub => 't' }, {'order_by' => {$FM_NAME_TO_ID{$type}.'n' => $order_by}} );
} else {
# FIXME: restore perm check
# ( $r, $evt ) = $U->checksesperm($authtoken, 'VIEW_COPY_NOTES');
# return $evt if $evt;
return $U->cstorereq(
- 'open-ils.cstore.direct.serial.'.$type.'_note.search.atomic', {$type => $id} );
+ 'open-ils.cstore.direct.serial.'.$type.'_note.search.atomic', {$type => $id}, {'order_by' => {$FM_NAME_TO_ID{$type}.'n' => $order_by}} );
}
return undef;
diff --git a/Open-ILS/xul/staff_client/server/serial/notes.xul b/Open-ILS/xul/staff_client/server/serial/notes.xul
index 895b913..bb6ce84 100644
--- a/Open-ILS/xul/staff_client/server/serial/notes.xul
+++ b/Open-ILS/xul/staff_client/server/serial/notes.xul
@@ -247,16 +247,16 @@
<messagecatalog id="serialStrings" src="/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
<stack hidden="true" id="note_template" flex="1">
- <groupbox flex="1" style="background-color: black;"/>
- <groupbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px;" >
+ <vbox flex="1" style="background-color: black; margin:3px"/>
+ <vbox flex="1" style="background-color: #FFDE00; -moz-border-radius-topright: 35px; border: 2px groove ThreeDFace; margin:3px;" >
<hbox>
<description name="title" style="font-weight: bold"/>
<spacer flex="1"/>
<description name="create_date" style="font-weight: bold"/>
<description name="pub" style="font-weight: bold"/>
</hbox>
- <description name="value"/>
- </groupbox>
+ <description style="white-space: pre-wrap;" name="value"/>
+ </vbox>
</stack>
<vbox flex="1" class="my_overflow" id="notes_panel">
commit 9f8e12a96067505b7bf151a2355f8a7cb5925bc4
Author: Dan Wells <dbw2 at calvin.edu>
Date: Tue Apr 17 16:02:49 2012 -0400
Limit excess serial data fetching
Overfetching and duplication of data in the interface is both
inefficient and bug-inducing. This reduces a couple big offenders.
First, in the items tab, we will store distribution and subscription
data separately, rather than duplicating for every row. Second, we
will only redraw rows as needed rather than refresh the whole list so
often. Finally, we no longer need to lookup call numbers separately,
as they are included in the one-time distribution fetch.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
index 8333f3b..6d645ae 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Serial.pm
@@ -344,7 +344,7 @@ sub fleshed_serial_item_retrieve_batch {
"open-ils.cstore.direct.serial.item.search.atomic",
{ id => $ids },
{ flesh => 2,
- flesh_fields => {sitem => [ qw/issuance creator editor stream unit notes/ ], sstr => ["distribution"], sunit => ["call_number"], siss => [qw/creator editor subscription/]}
+ flesh_fields => {sitem => [ qw/issuance creator editor stream unit notes/ ], sunit => ["call_number"], siss => [qw/creator editor subscription/]}
});
}
@@ -2476,7 +2476,7 @@ sub fleshed_serial_distribution_retrieve_batch {
"open-ils.cstore.direct.serial.distribution.search.atomic",
{ id => $ids },
{ flesh => 1,
- flesh_fields => {sdist => [ qw/ holding_lib receive_call_number receive_unit_template bind_call_number bind_unit_template streams / ]}
+ flesh_fields => {sdist => [ qw/ holding_lib receive_call_number receive_unit_template bind_call_number bind_unit_template streams notes / ]}
});
}
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 ec56204..acaae8c 100644
--- a/Open-ILS/xul/staff_client/server/serial/manage_items.js
+++ b/Open-ILS/xul/staff_client/server/serial/manage_items.js
@@ -17,8 +17,11 @@ serial.manage_items = function (params) {
serial.manage_items.prototype = {
'list_sitem_map' : {},
+ 'sdist_map' : {},
+ 'ssub_map' : {},
+ 'row_map' : {},
- 'set_sdist_ids' : function () {
+ 'retrieve_ssubs_and_sdists' : function () {
var obj = this;
try {
@@ -37,11 +40,41 @@ serial.manage_items.prototype = {
if (robj != null) {
if (typeof robj.ilsevent != 'undefined') throw(robj);
obj.sdist_ids = robj.length ? robj : [robj];
+ // now get actual sdist and ssub objects
+ robj = obj.network.simple_request(
+ 'FM_SDIST_FLESHED_BATCH_RETRIEVE.authoritative',
+ [ obj.sdist_ids ]
+ );
+ if (robj != null) {
+ if (typeof robj.ilsevent != 'undefined') throw(robj);
+ robj = robj.length ? robj : [robj];
+ for (var i = 0; i < robj.length; i++) {
+ obj.sdist_map[robj[i].id()] = robj[i];
+ }
+ }
+ robj = obj.network.request(
+ 'open-ils.pcrud',
+ 'open-ils.pcrud.id_list.ssub',
+ [ ses(), {"+sdist" : {"id" : obj.sdist_ids}}, {"join":"sdist"} ]
+ );
+ var ssub_ids = robj.length ? robj : [robj];
+ robj = obj.network.simple_request(
+ 'FM_SSUB_FLESHED_BATCH_RETRIEVE.authoritative',
+ [ ssub_ids ]
+ );
+ if (robj != null) {
+ if (typeof robj.ilsevent != 'undefined') throw(robj);
+ robj = robj.length ? robj : [robj];
+ for (var i = 0; i < robj.length; i++) {
+ obj.ssub_map[robj[i].id()] = robj[i];
+ }
+ }
} else {
obj.sdist_ids = [];
}
+
} catch(E) {
- obj.error.standard_unexpected_error_alert('set_sdist_ids failed!',E);
+ obj.error.standard_unexpected_error_alert('retrieve_ssubs_and_sdists failed!',E);
}
},
@@ -90,7 +123,7 @@ serial.manage_items.prototype = {
//if (document.getElementById('serial_item_refresh_button')) document.getElementById('serial_item_refresh_button').focus();
obj.save_settings();
// get latest sdist id list based on library drowdown
- obj.set_sdist_ids();
+ obj.retrieve_ssubs_and_sdists();
obj.refresh_list('main');
obj.refresh_list('workarea');
},
@@ -138,7 +171,7 @@ serial.manage_items.prototype = {
obj.build_menus();
obj.set_sunit($('serial_items_current_sunit').getAttribute('sunit_id'), $('serial_items_current_sunit').getAttribute('sunit_label'), $('serial_items_current_sunit').getAttribute('sdist_id'), $('serial_items_current_sunit').getAttribute('sstr_id'));
- obj.set_sdist_ids();
+ //obj.retrieve_ssubs_and_sdists();
obj.init_lists();
var mode_radio_group = $('serial_manage_items_mode');
@@ -207,7 +240,7 @@ serial.manage_items.prototype = {
spawn_sitem_editor( { 'sitem_ids' : list, 'do_edit' : 1 } );
- obj.refresh_list(obj.selected_list);
+ obj.refresh_rows(list);
} catch(E) {
obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.edit_items.error'),E);
@@ -277,7 +310,7 @@ serial.manage_items.prototype = {
var robj = obj.network.request(
'open-ils.serial',
'open-ils.serial.item.fleshed.batch.update',
- [ ses(), list, true ],
+ [ ses(), list ],
null,
{
'title' : document.getElementById('catStrings').getString('staff.cat.copy_browser.delete_items.override'),
@@ -375,7 +408,7 @@ serial.manage_items.prototype = {
}
var prompt_text;
if (obj.current_sunit_id == -1) {
- prompt_text = 'for '+item.issuance().label()+ ' from Distribution: '+item.stream().distribution().label()+'/'+item.stream().id()+':';
+ prompt_text = 'for '+item.issuance().label()+ ' from Distribution: '+obj.sdist_map[item.stream().distribution()].label()+'/'+item.stream().id()+':';
} else { // must be -2
prompt_text = 'for the new unit:';
}
@@ -407,25 +440,18 @@ serial.manage_items.prototype = {
barcodes[item.id()] = barcode;
// now call numbers
- if (typeof call_numbers_by_siss_and_sdist[item.issuance().id() + '@' + item.stream().distribution().id()] == 'undefined') {
+ if (typeof call_numbers_by_siss_and_sdist[item.issuance().id() + '@' + item.stream().distribution()] == 'undefined') {
var default_cn = 'DEFAULT';
// if they defined a *_call_number, honor it as the default
- var preset_cn_id = item.stream().distribution()[mode + '_call_number']();
- if (preset_cn_id) {
- var preset_default_cn = obj.network.request(
- 'open-ils.pcrud',
- 'open-ils.pcrud.retrieve.acn',
- [ ses(), preset_cn_id ]
- );
- if (preset_default_cn) {
- default_cn = preset_default_cn.label();
- }
+ var preset_cn = obj.sdist_map[item.stream().distribution()][mode + '_call_number']();
+ if (preset_cn) {
+ default_cn = preset_cn.label();
} else {
// for now, let's default to the last created call number if there is one
var acn_list = obj.network.request(
'open-ils.pcrud',
'open-ils.pcrud.search.acn',
- [ ses(), {"record" : obj.docid, "owning_lib" : item.stream().distribution().holding_lib(), "deleted" : 'f' }, {"order_by" : {"acn" : "create_date DESC"}, "limit" : "1" } ]
+ [ ses(), {"record" : obj.docid, "owning_lib" : obj.sdist_map[item.stream().distribution()].holding_lib().id(), "deleted" : 'f' }, {"order_by" : {"acn" : "create_date DESC"}, "limit" : "1" } ]
);
if (acn_list) {
@@ -442,10 +468,10 @@ serial.manage_items.prototype = {
call_number = 'DEFAULT'; //TODO: real default by setting
}
call_numbers[item.id()] = call_number;
- call_numbers_by_siss_and_sdist[item.issuance().id() + '@' + item.stream().distribution().id()] = call_number;
+ call_numbers_by_siss_and_sdist[item.issuance().id() + '@' + item.stream().distribution()] = call_number;
} else {
// we have already seen this same issuance and distribution combo, so use the same call number
- call_numbers[item.id()] = call_numbers_by_siss_and_sdist[item.issuance().id() + '@' + item.stream().distribution().id()];
+ call_numbers[item.id()] = call_numbers_by_siss_and_sdist[item.issuance().id() + '@' + item.stream().distribution()];
}
if (obj.current_sunit_id == -2) {
@@ -468,7 +494,7 @@ serial.manage_items.prototype = {
obj.current_sunit_id = robj.new_unit_id;
}
- obj.rebuild_current_sunit(list[0].stream().distribution().label(), list[0].stream().distribution().id(), list[0].stream().id());
+ obj.rebuild_current_sunit(obj.sdist_map[list[0].stream().distribution()].label(), list[0].stream().distribution(), list[0].stream().id());
obj.refresh_list('main');
obj.refresh_list('workarea');
@@ -501,7 +527,7 @@ serial.manage_items.prototype = {
'cmd_items_print' : [ ['command'], function() { obj.items_print(obj.selected_list); } ],
'cmd_items_export' : [ ['command'], function() { obj.items_export(obj.selected_list); } ],
- 'cmd_refresh_list' : [ ['command'], function() { obj.set_sdist_ids(); obj.refresh_list('main'); obj.refresh_list('workarea'); } ]
+ 'cmd_refresh_list' : [ ['command'], function() { obj.retrieve_ssubs_and_sdists(); obj.refresh_list('main'); obj.refresh_list('workarea'); } ]
}
}
);
@@ -663,7 +689,7 @@ serial.manage_items.prototype = {
obj.mode = mode;
}
- obj.set_sdist_ids();
+ obj.retrieve_ssubs_and_sdists();
if (mode == 'receive' || mode == 'advanced_receive') {
$('serial_workarea_mode_label').value = 'Recently Received';
@@ -736,6 +762,7 @@ serial.manage_items.prototype = {
var sitem = robj[0];
obj.list_sitem_map[sitem.id()] = sitem;
row.my.sitem = sitem;
+ row.my.parent_obj = obj;
//params.treeitem_node.setAttribute( 'retrieve_id', js2JSON({'copy_id':copy_id,'circ_id':row.my.circ.id(),'barcode':row.my.acp.barcode(),'doc_id': ( row.my.record ? row.my.record.id() : null ) }) );
params.treeitem_node.setAttribute( 'retrieve_id', js2JSON({'sitem_id':sitem.id()}) );
dump('dumping... ' + js2JSON(obj.list_sitem_map[sitem.id()]));
@@ -818,6 +845,28 @@ serial.manage_items.prototype = {
obj.retrieve(list_name);
},
+ // accepts a list of ids or a list of objects
+ 'refresh_rows' : function(list) {
+ var obj = this;
+
+ var id_list;
+
+ if (typeof list[0] == 'object') {
+ id_list = util.functional.map_list(
+ list,
+ function(o) {
+ return o.id()
+ }
+ );
+ } else {
+ id_list = list;
+ }
+
+ for (var i = 0; i < id_list.length; i++) {
+ obj.lists[obj.selected_list].refresh_row(obj.row_map[id_list[i]]);
+ }
+ },
+
'retrieve' : function(list_name) {
var obj = this;
var list = obj.lists[list_name];
@@ -856,7 +905,8 @@ serial.manage_items.prototype = {
}
for (i = 0; i < robj.length; i++) {
- list.append( { 'row' : { 'my' : { 'sitem_id' : robj[i] } }, 'to_bottom' : true, 'no_auto_select' : true } );
+ var nparams = list.append( { 'row' : { 'my' : { 'sitem_id' : robj[i] } }, 'to_bottom' : true, 'no_auto_select' : true } );
+ obj.row_map[robj[i]] = nparams;
}
},
@@ -919,15 +969,16 @@ function item_columns(modify,params) {
'primary' : false,
'hidden' : false,
'persist' : 'hidden width ordinal',
- 'render' : function(my) { return my.sitem.stream().distribution().label(); }
- }, {
+ 'render' : function(my) { return my.parent_obj.sdist_map[my.sitem.stream().distribution()].label(); }
+ },
+ {
'id' : 'distribution_ou',
'label' : $('serialStrings').getString('staff.serial.manage_items.holder.label'),
'flex' : 1,
'primary' : false,
'hidden' : false,
'persist' : 'hidden width ordinal',
- 'render' : function(my) { return data.hash.aou[ my.sitem.stream().distribution().holding_lib() ].shortname(); }
+ 'render' : function(my) { return my.parent_obj.sdist_map[my.sitem.stream().distribution()].holding_lib().shortname(); }
},
{
'id' : 'stream_id',
-----------------------------------------------------------------------
Summary of changes:
.../src/perlmods/lib/OpenILS/Application/Serial.pm | 14 +-
Open-ILS/web/opac/locale/en-US/lang.dtd | 10 +-
.../server/locale/en-US/serial.properties | 1 +
.../xul/staff_client/server/serial/manage_items.js | 202 +++++++++++++++++---
.../staff_client/server/serial/manage_items.xul | 6 +
Open-ILS/xul/staff_client/server/serial/notes.xul | 22 ++-
.../staff_client/server/serial/serctrl_main.xul | 3 +
7 files changed, 215 insertions(+), 43 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list