since we're enforcing the requiredness of address type, let's give it a default value...

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

diff --git a/Open-ILS/web/js/dojo/openils/actor/nls/register.js b/Open-ILS/web/js/dojo/openils/actor/nls/register.js
index 6e0f8af..5cdc023 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/actor/nls/register.js
+++ b/Open-ILS/web/js/dojo/openils/actor/nls/register.js
@@ -1,4 +1,5 @@
 {
+    "DEFAULT_ADDRESS_TYPE" : "MAILING",
     "DELETE_ADDRESS" : "Delete address ${0}?",
     "NEED_ADDRESS" : "An address is required during registration.",
     "DUPE_PATRON_NAME" : "Found ${0} patron(s) with the same name",

diff --git a/Open-ILS/web/js/ui/default/actor/user/register.js b/Open-ILS/web/js/ui/default/actor/user/register.js
index cff9071..eb53ecd 100644 (file)
--- a/Open-ILS/web/js/ui/default/actor/user/register.js
+++ b/Open-ILS/web/js/ui/default/actor/user/register.js
@@ -1213,6 +1213,10 @@ function uEditNewAddr(evt, id, mkLinks) {
             if(row.getAttribute('fmclass')) {
                 var widget = fleshFMRow(row, 'aua', {addr:id});
 
+                // make new addresses a default address type
+                if(id < 0 && row.getAttribute('fmfield') == 'address_type') 
+                    widget.widget.attr('value', localeStrings.DEFAULT_ADDRESS_TYPE); 
+
                 // make new addresses valid by default
                 if(id < 0 && row.getAttribute('fmfield') == 'valid') 
                     widget.widget.attr('value', true); 

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 3697f5a..f314c58 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -2657,7 +2657,7 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
                     }
                     if (rv == 0) {
                         try {
-                            JSAN.use('util.print'); var print = new util.print();
+                            JSAN.use('util.print'); var print = new util.print('receipt');
                             var old_template = String( data.hash.aous['ui.circ.old_harcoded_slip_template'] ) == 'true';
                             if (old_template) {
                                 msg = msg.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g,'<br/>');
@@ -2787,7 +2787,7 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
                     }
                     if (rv == 0) {
                         try {
-                            JSAN.use('util.print'); var print = new util.print();
+                            JSAN.use('util.print'); var print = new util.print('receipt');
                             msg = msg.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g,'<br/>');
                             print.simple( msg , { 'no_prompt' : true, 'content_type' : 'text/html' } );
                         } catch(E) {
@@ -2984,7 +2984,7 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
             }
             if (rv == 0) {
                 try {
-                    JSAN.use('util.print'); var print = new util.print();
+                    JSAN.use('util.print'); var print = new util.print('receipt');
                     var old_template = String( data.hash.aous['ui.circ.old_harcoded_slip_template'] ) == 'true';
                     if (old_template) {
                         msg = msg.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\n/g,'<br/>');