backport changeset 14662: modified patch from Steve Callender; exposes the patron...

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@14663 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/chrome/content/util/print.js b/Open-ILS/xul/staff_client/chrome/content/util/print.js
index 34ce66c..619dbc2 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/util/print.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/print.js
@@ -164,6 +164,10 @@ util.print.prototype = {
                        catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
                try{b = s; s = s.replace(/%STAFF_PROFILE%/,obj.data.hash.pgt[ params.staff.profile() ].name() ); }
                        catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+               try{b = s; s = s.replace(/%PATRON_ALIAS_OR_FIRSTNAME%/,(params.patron.alias() == '' || params.patron.alias() == null) ? params.patron.first_given_name() : params.patron.alias());} 
+                       catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');} 
+               try{b = s; s = s.replace(/%PATRON_ALIAS%/,(params.patron.alias() == '' || params.patron.alias() == null) ? '' : params.patron.alias());} 
+                       catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');} 
                try{b = s; s = s.replace(/%PATRON_FIRSTNAME%/,params.patron.first_given_name());}
                        catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
                try{b = s; s = s.replace(/%PATRON_LASTNAME%/,params.patron.family_name());}

diff --git a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js
index 340f870..e0c32f1 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js
+++ b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js
@@ -24,6 +24,7 @@ circ.print_list_template_editor.prototype = {
                        this.test_patron = new au();
                        this.test_patron.family_name('Doe');
                        this.test_patron.first_given_name('John');
+                       this.test_patron.alias('Curly');
                        this.test_card = new ac();
                        this.test_card.barcode('123456789');
                        this.test_patron.card( this.test_card );
@@ -262,7 +263,7 @@ circ.print_list_template_editor.prototype = {
                                                                                        + document.getElementById('circStrings').getString('staff.circ.print_list_template.window.heading')
                                                                                        + '</h1>'
                                                                                        + '<p>%SHORTNAME%, %TODAY%, %STAFF_FIRSTNAME%, %STAFF_LASTNAME%, '
-                                                                                       + '%PATRON_FIRSTNAME%, %LIBRARY%</p>'
+                                                                                       + '%PATRON_FIRSTNAME%, %PATRON_ALIAS%, %PATRON_ALIAS_OR_FIRSTNAME%, %LIBRARY%</p>'
                                                                                        + '<h1>'
                                                                                        + document.getElementById('circStrings').getFormattedString('staff.circ.print_list_template.window.template_type', [template_type])
                                                                                        + '</h1>'