From a91a826551282bc27d08aa97ed8fb1efe8a80167 Mon Sep 17 00:00:00 2001 From: phasefx Date: Fri, 13 Nov 2009 04:01:27 +0000 Subject: [PATCH] more columns for the triggered events UI. Some label collisions/ambiguity; could override/hand-craft the labels, but maybe something like adding the class label for the column-come-lately's git-svn-id: svn://svn.open-ils.org/ILS/trunk@14891 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../server/patron/trigger_events.js | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/patron/trigger_events.js b/Open-ILS/xul/staff_client/server/patron/trigger_events.js index d5cecc7630..5dfc50f6b9 100644 --- a/Open-ILS/xul/staff_client/server/patron/trigger_events.js +++ b/Open-ILS/xul/staff_client/server/patron/trigger_events.js @@ -107,7 +107,32 @@ function init_list() { list = new util.list( 'atev_list' ); list.init( { - 'columns' : [ 'atev' ], + 'columns' : [].concat( + list.fm_columns('atev', { + 'atev_target' : { 'render' : function(my) { return fieldmapper.IDL.fmclasses[my.atev.target().classname].label; } } + }) + ).concat( + list.fm_columns('atevdef', { + '*' : { 'hidden' : true }, + 'atevdef_name' : { 'hidden' : false }, + 'atevdef_reactor' : { 'hidden' : false } + }) + ).concat( + list.fm_columns('circ', { + '*' : { 'hidden' : true }, + 'circ_due_date' : { 'hidden' : false } + }) + ).concat( + list.fm_columns('acp', { + '*' : { 'hidden' : true }, + 'acp_barcode' : { 'hidden' : false } + }) + ).concat( + list.fm_columns('ahr', { + '*' : { 'hidden' : true }, + 'ahr_id' : { 'hidden' : false } + }) + ), 'retrieve_row' : retrieve_row, 'on_select' : handle_selection } @@ -149,7 +174,11 @@ function populate_list() { var row_params = { 'row' : { 'my' : { - 'atev' : evt + 'atev' : evt, + 'atevdef' : evt.event_def(), + 'circ' : evt.target().classname == 'circ' ? evt.target() : null, + 'ahr' : evt.target().classname == 'ahr' ? evt.target() : null, + 'acp' : evt.target().classname == 'circ' ? evt.target().target_copy() : evt.target().current_copy() } } }; -- 2.43.2