Commits

Maciej Wiśniowski committed 4071e69 Merge

merge with origin

  • Participants
  • Parent commits 3d8afdb, 31e7238

Comments (0)

Files changed (10)

 d1663e27f391f22f79d75fb2f03247dc7ef2b013 0.6.3
 00158b8e01bd7c37d0e6551097cc444df6f4784e 0.6.4
 a24a4a078c3b55f52e2db47423d10b4e6912e4a4 0.6.5
+bef2bdb679e11e06f08e6a9a9ce3d64fa987e7fc 0.6.6
 Changes
 =======
 
+0.6.6 (2012-02-09)
+------------------
+
+* Bugfix: fixed url for Pages at breadcrums (Maciej Wiśniowski)
+* Bugfix: display sale price at category products page (Maciej Wiśniowski)
+* Bugfix: fix product pagination (Maciej Wiśniowski)
+* Bugfix: added short_description to Category management UI
+* Bugfix: display category descriptions
+* Bugfix: fixed template selection; issue #134
+* Improvement: allow easy modification of category/product templates (Maciej Wiśniowski)
+* Updated polish translations (Maciej Wiśniowski)
+
 0.6.5 (2012-02-03)
 ------------------
 

lfs/core/management/commands/lfs_init.py

         PortletAssignment.objects.create(slot=left_slot, content=shop, portlet=pages_portlet)
 
         # Payment methods
-        PaymentMethod.objects.create(pk=1, name="Direct debit", priority=1, active=1, deletable=0, type=PM_BANK)
-        PaymentMethod.objects.create(pk=2, name="Cash on delivery", priority=2, active=1, deletable=0)
-        PaymentMethod.objects.create(pk=3, name="PayPal", priority=3, active=1, deletable=0)
-        PaymentMethod.objects.create(pk=4, name="Prepayment", priority=4, active=1, deletable=0)
+        pm = PaymentMethod.objects.create(name="Direct debit", priority=1, active=1, deletable=0, type=PM_BANK)
+        pm.id=1; pm.save()
+        pm = PaymentMethod.objects.create(name="Cash on delivery", priority=2, active=1, deletable=0)
+        pm.id=2; pm.save()
+        pm = PaymentMethod.objects.create(name="PayPal", priority=3, active=1, deletable=0)
+        pm.id=3; pm.save()
+        pm = PaymentMethod.objects.create(name="Prepayment", priority=4, active=1, deletable=0)
+        pm.id=4; pm.save()
 
         # Shipping methods
         ShippingMethod.objects.create(name="Standard", priority=1, active=1)

lfs/manage/views/categories/category.py

 
     class Meta:
         model = Category
-        fields = ("name", "slug", "short_description", "description",
-                  "exclude_from_navigation", "image", "static_block")
+        fields = ("name", "slug", "short_description", "description", "short_description",
+        "exclude_from_navigation", "image", "static_block")
 
 
 @permission_required("core.manage_shop", login_url="/login/")

lfs/manage/views/categories/view.py

     }))
 
     if request.is_ajax():
+        html = [["#view", view_html]]
         return HttpResponse(simplejson.dumps({
-            "view": view_html,
+            "html": html,
             "message": message,
         }, cls=LazyEncoder))
     else:

lfs/templates/manage/category/data.html

             {% endif %}
         </div>
     </fieldset>
+    <div class="field">
+        <div class="label">
+            {{ form.short_description.label_tag }}:
+        </div>
+        {% if form.short_description.errors %}
+            <div class="error">
+                {{ form.short_description }}
+                {{ form.short_description.errors }}
+            </div>
+        {% else %}
+            <div>
+                {{ form.short_description }}
+            </div>
+        {% endif %}
+    </div>
+    <div class="field">
+        <div class="label">
+            {{ form.description.label_tag }}:
+        </div>
+        {% if form.description.errors %}
+            <div class="error">
+                {{ form.description }}
+                {{ form.description.errors }}
+            </div>
+        {% else %}
+            <div>
+                {{ form.description }}
+            </div>
+        {% endif %}
+    </div>
     <fieldset>
-        <legend>{% trans "Content" %}</legend>
-            <div class="field">
-                <div class="label">
-                    {{ form.description.label_tag }}:
-                </div>
-                {% if form.description.errors %}
-                    <div class="error">
-                        {{ form.description }}
-                        {{ form.description.errors }}
-                    </div>
-                {% else %}
-                    <div>
-                        {{ form.description }}
-                    </div>
-                {% endif %}
-            </div>
+        <legend>{% trans "Appearance" %}</legend>
             <div class="field">
                 <div class="label">
                     {% trans "Image" %}

lfs/templates/manage/category/view.html

 
 <form action="{% url lfs_manage_category_view category.id %}"
       method="post"
-      class="category-data-form"
-      enctype="multipart/form-data">
+      class="category-data-form">
     {% csrf_token %}
-
     {% include "manage/lfs_form.html" %}
-
     <div class="buttons">
         <input value="{% trans 'Save View' %}"
                type="submit"
             }
         }
     })
-</script>
+</script>

lfs/templates/manage/product/images.html

     <form id="active-images-update-form"
           action="{% url lfs_manage_update_active_images product.id %}"
           method="post">
+        {% csrf_token %}
         <input type="checkbox"
                name="active_images"
                {% if product.active_images %}checked="checked"{% endif %} />
             }
         });
     });
-</script>
+</script>

lfs/templates/manage/widgets/selectimage.html

 {% load i18n %}
 
-<select onchange ="document.getElementById('{{selectimageid}}').src=this.options[this.selectedIndex].title" {{ finalattrs|safe }}>
+<select {{ finalattrs|safe }}>
     {% for id, urls in choices %}
         {% with id|stringformat:"s" as idstring %}
-            {% ifequal id currentvalue %}
-                <option value="{{ id }}" title="{{urls.image}}" selected="selected">{{urls.name}}</option>
+            {% if idstring == currentvalue or id == currentvalue %}
+                <option value="{{ id }}" title="{{ urls.image }}" selected="selected">{{ urls.name }}</option>
             {% else %}
-                <option value="{{ id }}" title="{{urls.image}}">{{urls.name}}</option>
-            {% endifequal %}
+                <option value="{{ id }}" title="{{ urls.image }}">{{ urls.name }}</option>
+            {% endif %}
         {% endwith %}
     {% endfor %}
 </select>
 from setuptools import setup, find_packages
 import os
 
-version = '0.6.5'
+version = '0.6.6'
 
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, 'README.txt')).read()
       dependency_links=["http://pypi.iqpp.de/"],
       install_requires=[
         'setuptools',
-        'django-lfstheme == 0.6.3',
+        'django-lfstheme == 0.6.4',
         'django-pagination == 1.0.7',
         'django-paypal == 0.1.2',
         'django-portlets == 1.1',