[open-ils-commits] r14816 - in trunk/Open-ILS/web: js/dojo/openils/actor/nls js/ui/default/actor/user templates/default/actor/user (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-11-06 16:11:28 -0500 (Fri, 06 Nov 2009)
New Revision: 14816

Modified:
   trunk/Open-ILS/web/js/dojo/openils/actor/nls/register.js
   trunk/Open-ILS/web/js/ui/default/actor/user/register.js
   trunk/Open-ILS/web/templates/default/actor/user/register.tt2
Log:
plugged in details on replaced addr for approval of changes process

Modified: trunk/Open-ILS/web/js/dojo/openils/actor/nls/register.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/actor/nls/register.js	2009-11-06 21:09:48 UTC (rev 14815)
+++ trunk/Open-ILS/web/js/dojo/openils/actor/nls/register.js	2009-11-06 21:11:28 UTC (rev 14816)
@@ -3,5 +3,6 @@
     DUPE_PATRON_EMAIL : 'Found ${0} patron(s) with the same email address',
     DUPE_PATRON_IDENT : 'Found ${0} patron(s) with the same identification',
     DUPE_PATRON_PHONE : 'Found ${0} patron(s) with the same phone number',
-    DUPE_PATRON_ADDR : 'Found ${0} patron(s) with the same address'
+    DUPE_PATRON_ADDR : 'Found ${0} patron(s) with the same address',
+    REPLACED_ADDRESS : '<div>Replaces address <b>${0}</b><br/> ${1} ${2}<br/> ${3}, ${4} ${5}</div>'
 }

Modified: trunk/Open-ILS/web/js/ui/default/actor/user/register.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/actor/user/register.js	2009-11-06 21:09:48 UTC (rev 14815)
+++ trunk/Open-ILS/web/js/ui/default/actor/user/register.js	2009-11-06 21:11:28 UTC (rev 14816)
@@ -845,7 +845,18 @@
 
                     if(addr.replaces()) {
                         var div = dojo.query('[name=replaced-addr]', row)[0]
-                        div.innerHTML = addr.replaces();
+                        var replaced =  patron.addresses().filter(
+                            function(i) { return (i.id() == addr.replaces()) })[0];
+
+                        div.innerHTML = dojo.string.substitute(localeStrings.REPLACED_ADDRESS, [
+                            replaced.address_type() || '',
+                            replaced.street1() || '',
+                            replaced.street2() || '',
+                            replaced.city() || '',
+                            replaced.state() || '',
+                            replaced.post_code() || ''
+                        ]);
+
                     } else {
                         openils.Util.hide(dojo.query('[name=replaced-addr-div]', row)[0]);
                     }

Modified: trunk/Open-ILS/web/templates/default/actor/user/register.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/actor/user/register.tt2	2009-11-06 21:09:48 UTC (rev 14815)
+++ trunk/Open-ILS/web/templates/default/actor/user/register.tt2	2009-11-06 21:11:28 UTC (rev 14816)
@@ -138,7 +138,6 @@
                 <span style='padding-right:10px;'>This is a pending address: </span>
                 <button name='approve-button'>Approve Address</button>
                 <div name='replaced-addr-div'>
-                    <span>This address replaces:</span>
                     <div name='replaced-addr'></div>
                 </div>
             </td>