Merge branch 'master' into v0.9

1 files changed, 15 insertions, 7 deletions

diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index f185576ea..0be382866 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -90,8 +90,16 @@ def index(request):
     """
     Main page
     """
-    dct = {}
+    dct = {'warnings': []}
+    if settings.PROJECT_SLUG == 'default':
+        dct['warnings'].append(_(
+            u"PROJECT_SLUG is set to \"default\" change it in your "
+            u"local_settings (or ask your admin to do it)."))
     profile = get_current_profile()
+    if profile.slug == 'default':
+        dct['warnings'].append(_(
+            u"The slug of your current profile is set to \"default\" change it "
+            u"on the administration page (or ask your admin to do it)."))
     image = get_random_item_image_link(request)
     if hasattr(profile, 'homepage') and profile.homepage:
         dct['homepage'] = markdown(profile.homepage)
@@ -454,7 +462,7 @@ def autocomplete_person(request, person_types=None, attached_to=None,
         own_items = request.user.has_perm('ishtar_common.view_own_person',
                                           models.Person)
     if not all_items and not own_items or not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse('[]', mimetype='text/plain')
     q = request.GET.get('term')
     limit = request.GET.get('limit', 20)
     try:
@@ -490,7 +498,7 @@ def autocomplete_person(request, person_types=None, attached_to=None,
 
 def autocomplete_department(request):
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse('[]', mimetype='text/plain')
     q = request.GET.get('term')
     q = unicodedata.normalize("NFKD", q).encode('ascii', 'ignore')
     query = Q()
@@ -1325,9 +1333,9 @@ def autocomplete_organization(request, orga_type=None):
                                   models.Organization)
        and not request.user.ishtaruser.has_right(
             'person_search', session=request.session)):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse('[]', mimetype='text/plain')
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse('[]', mimetype='text/plain')
     q = request.GET.get('term')
     query = Q()
     for q in q.split(' '):
@@ -1351,9 +1359,9 @@ def autocomplete_author(request):
     if not request.user.has_perm('ishtar_common.view_author', models.Author)\
        and not request.user.has_perm('ishtar_common.view_own_author',
                                      models.Author):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse('[]', mimetype='text/plain')
     if not request.GET.get('term'):
-        return HttpResponse(mimetype='text/plain')
+        return HttpResponse('[]', mimetype='text/plain')
     q = request.GET.get('term')
     query = Q()
     for q in q.split(' '):