[open-ils-commits] r18131 - in branches/rel_2_0/Open-ILS: src/perlmods/OpenILS/WWW xul/staff_client/server/patron (senator)

[svn at svn.open-ils.org]

Author: senator
Date: 2010-10-01 17:50:48 -0400 (Fri, 01 Oct 2010)
New Revision: 18131

Modified:
   branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/Proxy.pm
   branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/holds.js
Log:
Backport r18130 from trunk


Modified: branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/Proxy.pm
===================================================================
--- branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/Proxy.pm	2010-10-01 21:48:41 UTC (rev 18130)
+++ branches/rel_2_0/Open-ILS/src/perlmods/OpenILS/WWW/Proxy.pm	2010-10-01 21:50:48 UTC (rev 18131)
@@ -80,7 +80,7 @@
         my $base = $cgi->url(-base=>1);
 		$base =~ s/^http:/https:/o;
 		print "Location: $base".$apache->unparsed_uri."\n\n";
-		return Apache2::Const::OK;
+		return Apache2::Const::REDIRECT;
 	}
 
 	if (!$auth_ses) {

Modified: branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/holds.js
===================================================================
--- branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/holds.js	2010-10-01 21:48:41 UTC (rev 18130)
+++ branches/rel_2_0/Open-ILS/xul/staff_client/server/patron/holds.js	2010-10-01 21:50:48 UTC (rev 18131)
@@ -351,7 +351,7 @@
                                 });
 
                                 var loc = urls.XUL_BROWSER + "?url=" + window.escape(
-                                    xulG.url_prefix("/opac/extras/circ/alt_pull_list.html")
+                                    xulG.url_prefix("/opac/extras/circ/alt_pull_list.html").replace("http:","https:")
                                 );
                                 xulG.new_tab(
                                     loc, {