--- a/src/hashcut/__init__.py Tue Jul 23 17:27:07 2013 +0200
+++ b/src/hashcut/__init__.py Mon Aug 26 13:05:54 2013 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 12, 0, "final", 0)
+VERSION = (0, 13, 0, "final", 0)
def get_version():
--- a/src/hashcut/templates/mashup_all_mashups.html Tue Jul 23 17:27:07 2013 +0200
+++ b/src/hashcut/templates/mashup_all_mashups.html Mon Aug 26 13:05:54 2013 +0200
@@ -52,7 +52,7 @@
<div class="hashcut-video-wrap profil">
{% for m in results.object_list %}
<div class="video-item">
- <a href="{% url 'mashup_hashcut branding=branding' ldt_id=m.project.ldt_id %}" class="screenshot">{% thumbnail m.project.image "302x202" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" alt=""/>{% empty %} {% endthumbnail %}</a>
+ <a href="{% url 'mashup_hashcut' branding=branding ldt_id=m.project.ldt_id %}" class="screenshot">{% thumbnail m.project.image "302x202" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" alt=""/>{% empty %} {% endthumbnail %}</a>
<h3><a class="title" href="{% url 'mashup_hashcut' branding=branding ldt_id=m.project.ldt_id %}">{% if m.project.title|length > 30 %}{{m.project.title|slice:":30"}}...{% else %}{{m.project.title}}{% endif %}</a> par <a class="author" href="{% url 'mashup_profile' branding=branding username=m.creator %}">{{ m.creator }}</a><!-- | <span class="duration">02:24</span> --></h3>
</div>
{% endfor %}
--- a/src/hashcut/views.py Tue Jul 23 17:27:07 2013 +0200
+++ b/src/hashcut/views.py Mon Aug 26 13:05:54 2013 +0200
@@ -1,6 +1,5 @@
from django.conf import settings
-from django.contrib.auth import authenticate, login, logout
-from django.contrib.auth.models import User
+from django.contrib.auth import authenticate, get_user_model, login, logout
from django.core.exceptions import ObjectDoesNotExist
from django.core.paginator import Paginator, InvalidPage, EmptyPage
from django.http import HttpResponseNotFound, HttpResponse
@@ -10,9 +9,10 @@
from ldt.api.ldt.resources import ProjectResource
from ldt.ldt_utils.models import Project, Content
from ldt.security.cache import cached_assign
-import logging
import re
+User = get_user_model()
+
class MashupContextView(View):
branding = "iri"
@@ -42,7 +42,6 @@
m2 = None
last_mashups = None
mashups = Mashup.objects.filter(branding=brd).order_by('-project__creation_date')[:6]
- logging.debug(repr(mashups))
l = len(mashups)
if l>0:
m1 = mashups[0]