diff --git a/NEWS b/NEWS
index 1bc736f..21257a9 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@
* You can now create and end links.
* Underline and strikethrough now work.
* Pulldowns for search suggestions, importing, and exporting show up.
+ * Fixed a bug that broke that Luminotes Desktop product download page if
+ PayPal took too long to notify Luminotes of the purchase.
1.5.2: October 1, 2008
* Leading/trailing spaces in note titles are now ignored when making links
diff --git a/controller/Users.py b/controller/Users.py
index f6844be..5ff3075 100644
--- a/controller/Users.py
+++ b/controller/Users.py
@@ -1636,7 +1636,7 @@ class Users( object ):
result[ "conversion" ] = "download_%s" % item_number
# otherwise, display an auto-reloading "processing..." page
else:
- note = Processing_download_note( download_access_id, retry_count )
+ note = Processing_download_note( download_access_id, tx, retry_count )
result[ "notebook" ] = main_notebook
result[ "startup_notes" ] = self.__database.select_many( Note, main_notebook.sql_load_startup_notes() )
diff --git a/controller/test/Test_users.py b/controller/test/Test_users.py
index 4b82a5e..2d07fe5 100644
--- a/controller/test/Test_users.py
+++ b/controller/test/Test_users.py
@@ -1750,7 +1750,6 @@ class Test_users( Test_controller ):
invite_button = u"send invites",
), session_id = self.session_id )
- print result
invites = result[ u"invites" ]
assert len( invites ) == 2
invite = invites[ 0 ]
@@ -4463,6 +4462,8 @@ class Test_users( Test_controller ):
assert result[ u"notes" ][ 0 ].notebook_id == self.anon_notebook.object_id
assert u"being processed" in result[ u"notes" ][ 0 ].contents
assert u"retry_count=1" in result[ u"notes" ][ 0 ].contents
+ assert u'' % access_id \
+ in result[ u"notes" ][ 0 ].contents
def test_thanks_download_not_yet_paid_with_retry( self ):
access_id = u"wheeaccessid"
@@ -4509,6 +4510,8 @@ class Test_users( Test_controller ):
assert result[ u"notes" ][ 0 ].notebook_id == self.anon_notebook.object_id
assert u"being processed" in result[ u"notes" ][ 0 ].contents
assert u"retry_count=4" in result[ u"notes" ][ 0 ].contents
+ assert u'' % access_id \
+ in result[ u"notes" ][ 0 ].contents
def test_thanks_download_not_yet_paid_with_retry_timeout( self ):
access_id = u"wheeaccessid"
@@ -4555,6 +4558,7 @@ class Test_users( Test_controller ):
assert result[ u"notes" ][ 0 ].notebook_id == self.anon_notebook.object_id
assert u"Thank you" in result[ u"notes" ][ 0 ].contents
assert u"confirmation" in result[ u"notes" ][ 0 ].contents
+ assert u"' % transaction_id \
+ in result[ u"notes" ][ 0 ].contents
def test_thanks_download_not_yet_paid_tx_with_retry( self ):
access_id = u"wheeaccessid"
@@ -4647,6 +4653,8 @@ class Test_users( Test_controller ):
assert result[ u"notes" ][ 0 ].notebook_id == self.anon_notebook.object_id
assert u"being processed" in result[ u"notes" ][ 0 ].contents
assert u"retry_count=4" in result[ u"notes" ][ 0 ].contents
+ assert u'' % transaction_id \
+ in result[ u"notes" ][ 0 ].contents
def test_thanks_download_not_yet_paid_tx_with_retry_timeout( self ):
access_id = u"wheeaccessid"
@@ -4693,6 +4701,7 @@ class Test_users( Test_controller ):
assert result[ u"notes" ][ 0 ].notebook_id == self.anon_notebook.object_id
assert u"Thank you" in result[ u"notes" ][ 0 ].contents
assert u"confirmation" in result[ u"notes" ][ 0 ].contents
+ assert u"