# HG changeset patch # User ymh # Date 1374512190 -7200 # Node ID 4645fbf981b2f6aad6532ceca1759ac9a570d58a # Parent dd46f7a3b0643c12c17228124afafe834f896458 Correct authentication + embed popup diff -r dd46f7a3b064 -r 4645fbf981b2 src/ldt/ldt/api/ldt/authentication.py --- a/src/ldt/ldt/api/ldt/authentication.py Mon Jul 22 18:46:20 2013 +0200 +++ b/src/ldt/ldt/api/ldt/authentication.py Mon Jul 22 18:56:30 2013 +0200 @@ -3,11 +3,11 @@ from django.utils.http import same_origin from tastypie.authentication import Authentication from tastypie.http import HttpUnauthorized -from django.contrib.auth.models import User +from django.contrib.auth import get_user_model from django.contrib.auth import login from ldt.security import set_current_user - +User = get_user_model() # imported from tastypie's next version 0.9.12 class SessionAuthentication(Authentication): diff -r dd46f7a3b064 -r 4645fbf981b2 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Mon Jul 22 18:46:20 2013 +0200 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Mon Jul 22 18:56:30 2013 +0200 @@ -63,12 +63,12 @@

{% trans "List of the project's contents" %}:

{% trans 'project id' %} ({% trans 'Select' %}) :
-
{% trans 'The project in Lignes de Temps' %} : {% trans 'See' %} - {% trans 'Select' %} :
+
{% trans 'The project in Lignes de Temps' %} : {% trans 'See' %} - {% trans 'Select' %} :

@@ -85,7 +85,7 @@
- +