diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-29 11:37:22 +0200 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-29 11:37:22 +0200 | 
| commit | 2a0842c8ffb0e7eec6b350f9d170670c8376cce8 (patch) | |
| tree | 7c0a2cb3713941ae7abb51e7591bd5398ac277ed /ishtar_common/views.py | |
| parent | 97545b37f75b5a7297b5788cef32edd08b295f9d (diff) | |
| parent | 9b773927aaf6549ff52c697cce8009f55b042be8 (diff) | |
| download | Ishtar-2a0842c8ffb0e7eec6b350f9d170670c8376cce8.tar.bz2 Ishtar-2a0842c8ffb0e7eec6b350f9d170670c8376cce8.zip | |
Merge branch 'master' into develop
Conflicts:
	version.py
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 10 | 
1 files changed, 9 insertions, 1 deletions
| diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 7a7c99953..be7c7b8e0 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -94,8 +94,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) | 
