Correct authentication on projects
authorymh <ymh.work@gmail.com>
Fri, 16 Nov 2012 16:44:27 +0100
changeset 950 f08d8b3e78b8
parent 949 091da391cbec
child 952 818a31dbc3db
Correct authentication on projects
src/ldt/ldt/api/ldt/authentication.py
src/ldt/ldt/indexation/search_indexes.py
src/ldt/ldt/ldt_utils/models.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
--- 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
--- 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):