# HG changeset patch # User ymh # Date 1353080667 -3600 # Node ID f08d8b3e78b80839fdc6c2350cf2dd4e19f820cd # Parent 091da391cbecd6a19ac4ea19aa5b37a46d602983 Correct authentication on projects diff -r 091da391cbec -r f08d8b3e78b8 src/ldt/ldt/api/ldt/authentication.py --- a/src/ldt/ldt/api/ldt/authentication.py Fri Nov 16 15:22:45 2012 +0100 +++ b/src/ldt/ldt/api/ldt/authentication.py Fri Nov 16 16:44:27 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 diff -r 091da391cbec -r f08d8b3e78b8 src/ldt/ldt/indexation/search_indexes.py --- a/src/ldt/ldt/indexation/search_indexes.py Fri Nov 16 15:22:45 2012 +0100 +++ b/src/ldt/ldt/indexation/search_indexes.py Fri Nov 16 16:44:27 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 diff -r 091da391cbec -r f08d8b3e78b8 src/ldt/ldt/ldt_utils/models.py --- a/src/ldt/ldt/ldt_utils/models.py Fri Nov 16 15:22:45 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/models.py Fri Nov 16 16:44:27 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):