Browse Source

Merge branch 'releases/0.3'

master
David Winterbottom 13 years ago
parent
commit
60d229abf2

+ 1
- 1
oscar/apps/payment/forms.py View File

161
         return months
161
         return months
162
 
162
 
163
     def year_choices(self):
163
     def year_choices(self):
164
-        years = [(x, x) for x in xrange( date.today().year - self.num_years, date.today().year)]
164
+        years = [(x, x) for x in xrange(date.today().year - self.num_years, date.today().year + 1)]
165
         years.insert(0, ("", "--"))
165
         years.insert(0, ("", "--"))
166
         return years
166
         return years
167
 
167
 

+ 1
- 1
oscar/templates/oscar/catalogue/browse.html View File

58
     </div>
58
     </div>
59
     {% if category.description %}
59
     {% if category.description %}
60
         <div class="row-fluid">
60
         <div class="row-fluid">
61
-            <div class="span9"><p>{{ category.description }}</p></div>
61
+            <div class="span9"><p>{{ category.description|safe }}</p></div>
62
 			{% if category.image %}
62
 			{% if category.image %}
63
 				<div class="span3"><img src="{{ category.image.url }}" alt="{{ summary }}" /></div>
63
 				<div class="span3"><img src="{{ category.image.url }}" alt="{{ summary }}" /></div>
64
 			{% endif %}
64
 			{% endif %}

+ 1
- 1
oscar/templates/oscar/dashboard/catalogue/category_list.html View File

47
     {% for category in child_categories %}
47
     {% for category in child_categories %}
48
         <tr>
48
         <tr>
49
             <td>{{ category.name }}</td>
49
             <td>{{ category.name }}</td>
50
-			<td>{{ category.description|default:""|truncatewords:6 }}</td>
50
+			<td>{{ category.description|default:""|striptags|cut:"&nbsp;"|truncatewords:6 }}</td>
51
 			<td>{{ category.get_num_children }}</td>
51
 			<td>{{ category.get_num_children }}</td>
52
             <td>
52
             <td>
53
                 <a class="btn btn-primary" href="{% url dashboard:catalogue-category-update category.id %}">Edit category</a>
53
                 <a class="btn btn-primary" href="{% url dashboard:catalogue-category-update category.id %}">Edit category</a>

Loading…
Cancel
Save