From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 7 May 2007 18:51:59 +0000 (+0000)
Subject: checking hold recipient (and not hold requestor) email to see if the email checkbox... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=883d008119ee3b2fe49fa55f2062cf46360cd5da;p=Evergreen.git

checking hold recipient (and not hold requestor) email to see if the email checkbox should be checked by default. changed language for staff client when there is no patron email


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

diff --git a/Open-ILS/web/opac/skin/default/js/holds.js b/Open-ILS/web/opac/skin/default/js/holds.js
index 1bd6ca6a28..745df278bc 100644
--- a/Open-ILS/web/opac/skin/default/js/holds.js
+++ b/Open-ILS/web/opac/skin/default/js/holds.js
@@ -9,6 +9,7 @@ item_form is specified, use item_type(s)--language
 */
 
 var noEmailMessage;
+var noEmailMessageXUL;
 
 function holdsHandleStaff() {
 	swapCanvas($('xulholds_box'));
@@ -57,6 +58,9 @@ function holdsDrawEditor(args) {
     if(!noEmailMessage)
         noEmailMessage = $('holds_email').removeChild($('holds.no_email'));
 
+    if(!noEmailMessageXUL)
+        noEmailMessageXUL = $('holds_email').removeChild($('holds.no_email.xul'));
+
 	if(isXUL() && holdArgs.recipient == null 
 			&& holdArgs.editHold == null) {
 		holdsHandleStaff();
@@ -407,13 +411,20 @@ function __holdsDrawWindow() {
 		}
 	}
 
-    if(!G.user.email()) {
+    //if(!G.user.email()) {
+    if(!holdArgs.recipient.email()) {
 		$('holds_enable_email').checked = false;	
 		$('holds_enable_email').disabled = true;
-        var n = noEmailMessage.cloneNode(true);
-	    appendClear( $('holds_email'), n);
-        unHideMe(n);
-        $('holds.no_email.my_account').setAttribute('href', buildOPACLink({page:MYOPAC},null,true));
+        var message;
+        if(isXUL()) {
+            message = noEmailMessageXUL.cloneNode(true);
+	        appendClear($('holds_email'), message);
+        } else {
+            message = noEmailMessage.cloneNode(true);
+	        appendClear($('holds_email'), message);
+            $('holds.no_email.my_account').setAttribute('href', buildOPACLink({page:MYOPAC},null,true));
+        }
+        unHideMe(message);
     }
 
 	if(!$('holds_phone').value) 
diff --git a/Open-ILS/web/opac/skin/default/xml/common/holds.xml b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
index b605871528..e611910e7a 100644
--- a/Open-ILS/web/opac/skin/default/xml/common/holds.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
@@ -92,8 +92,13 @@
 					<td class='holds_cell'>&opac.holds.concactEmail;:</td>
 					<td class='holds_cell' id='holds_email'> 
                         <span class='hide_me' id='holds.no_email'>
-                            (See <a class='classic_link' id='holds.no_email.my_account'>My Account</a> for setting your email address)
+                            (See <a class='classic_link' 
+                                id='holds.no_email.my_account'>My Account</a> for setting your email address)
                         </span>
+                        <span class='hide_me' id='holds.no_email.xul'>
+                            (Patron has no configured email address)
+                        </span>
+
                     </td>
 				</tr>
 				<tr>