Changeset 1578

Timestamp:

10/01/08 02:28:06 (2 months ago)

Author:

chris

Message:

Fix a couple of bugs with downloadable products. Closes #593

Files:

• satchmo/trunk/satchmo/payment/views (modified) (1 prop)
• satchmo/trunk/satchmo/product/models.py (modified) (3 diffs)
• satchmo/trunk/satchmo/shop/models.py (modified) (1 diff)

satchmo/trunk/satchmo/product/models.py

@@ -11 +11 @@
-import sha
-import signals
+import os.path
-
-from django.conf import settings
@@ -1114 +1115 @@
-    raw = config_value_safe('PRODUCT', 'PROTECTED_DIR', 'images/')
-    updir = normalize_dir(raw)
-updir
+os.path.join(updir, os.path.basename(filename))
-
-class DownloadableProduct(models.Model):
@@ -1121 +1122 @@
-    """
-    product = models.OneToOneField(Product, verbose_name=_("Product"), primary_key=True)
-,
+
-    num_allowed_downloads = models.IntegerField(_("Num allowed downloads"), help_text=_("Number of times link can be accessed."))
-    expire_minutes = models.IntegerField(_("Expire minutes"), help_text=_("Number of minutes the link should remain active."))

satchmo/trunk/satchmo/shop/models.py

@@ -18 +18 @@
-from django.db import models
-from django.utils.encoding import force_unicode
+from django.core import urlresolvers 
-from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext, ugettext_lazy as _