--- a/src/ldt/ldt/api/ldt/authentication.py Fri Nov 16 17:07:19 2012 +0100
+++ b/src/ldt/ldt/api/ldt/authentication.py Fri Nov 16 17:08:05 2012 +0100
@@ -24,7 +24,7 @@
# We also can't risk accessing ``request.POST``, which will break with
# the serialized bodies.
if request.method in ('GET', 'HEAD', 'OPTIONS', 'TRACE'):
- return request.user.is_authenticated()
+ return True
if getattr(request, '_dont_enforce_csrf_checks', False):
return request.user.is_authenticated()
@@ -55,4 +55,7 @@
This implementation returns the user's username.
"""
- return request.user.username
\ No newline at end of file
+ if request.user:
+ return request.user.username
+ else:
+ return "anon."
\ No newline at end of file
--- a/src/ldt/ldt/indexation/search_indexes.py Fri Nov 16 17:07:19 2012 +0100
+++ b/src/ldt/ldt/indexation/search_indexes.py Fri Nov 16 17:08:05 2012 +0100
@@ -33,7 +33,7 @@
title = indexes.CharField(model_attr='title', indexed=True, stored=True)
abstract = indexes.CharField(model_attr='description', indexed=True, stored=False)
text_field = indexes.CharField(model_attr='text', indexed=True, stored=False)
- annotation_id = indexes.CharField(model_attr='extarnal_id', indexed=False, stored=True)
+ annotation_id = indexes.CharField(model_attr='external_id', indexed=False, stored=True)
def get_model(self):
return Annotation
--- a/src/ldt/ldt/ldt_utils/models.py Fri Nov 16 17:07:19 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/models.py Fri Nov 16 17:08:05 2012 +0100
@@ -298,7 +298,7 @@
def __unicode__(self):
- return str(self.id) + ": " + self.iri_id
+ return str(self.id) + ":" + self.iri_id + ":" + self.title.replace("\n", " ")
def iri_url(self, web_url=settings.WEB_URL):
if url_utils.is_absolute(self.iriurl):
--- a/src/ldt/ldt/user/forms.py Fri Nov 16 17:07:19 2012 +0100
+++ b/src/ldt/ldt/user/forms.py Fri Nov 16 17:08:05 2012 +0100
@@ -102,7 +102,7 @@
class Meta:
model = User
- fields = ('username', 'email', 'first_name', 'last_name')
+ fields = ('username', 'email', 'first_name', 'last_name', 'password')
class LanguageChangeForm(forms.Form):
--- a/src/ldt/ldt/user/views.py Fri Nov 16 17:07:19 2012 +0100
+++ b/src/ldt/ldt/user/views.py Fri Nov 16 17:08:05 2012 +0100
@@ -8,7 +8,6 @@
from django.utils.translation import ugettext as _
from forms import ProfileForm, LanguageChangeForm, PictureForm
from django.views.i18n import set_language
-
@login_required
def profile(request):
@@ -20,7 +19,6 @@
profile_form = ProfileForm(request.user, request.POST, instance=request.user)
language_form = LanguageChangeForm(request.user, request.POST)
password_form = PasswordChangeForm(request.user)
-
if profile_form.is_valid() and language_form.is_valid():
profile_form.save()
language_form.save()
@@ -32,7 +30,6 @@
language_form = LanguageChangeForm()
profile_form = ProfileForm(instance=request.user)
password_form = PasswordChangeForm(request.user)
-
profile_picture_form = PictureForm()
return render_to_response('ldt/user/change_profile.html', {'profile_form' : profile_form, 'language_form' : language_form, 'password_form' : password_form, 'user_language' : user_language, 'profile_picture_form':profile_picture_form, 'msg' : msg }, context_instance=RequestContext(request))