Revision 2cbaacd5

b/astakos/im/settings.py
40 40
#Enable invitations
41 41
INVITATIONS_ENABLED = getattr(settings, 'ASTAKOS_INVITATIONS_ENABLED', True)
42 42

  
43
# The URL where requests are redirected for login, especially when using the login_required() decorator.
44
LOGIN_URL = getattr(settings, 'ASTAKOS_LOGIN_URL', '/im')
45

  
46 43
COOKIE_NAME = getattr(settings, 'ASTAKOS_COOKIE_NAME', '_pithos2_a')
47 44
COOKIE_DOMAIN = getattr(settings, 'ASTAKOS_COOKIE_DOMAIN', None)
48 45

  
b/astakos/im/views.py
155 155
    The view uses commit_manually decorator in order to ensure the number of the
156 156
    user invitations is going to be updated only if the email has been successfully sent.
157 157
    
158
    If the user isn't logged in, redirects to settings.ASTAKOS_LOGIN_URL.
158
    If the user isn't logged in, redirects to settings.LOGIN_URL.
159 159
    
160 160
    **Arguments**
161 161
    
......
175 175
    The view expectes the following settings are defined:
176 176
    
177 177
    * LOGIN_URL: login uri
178
    * DEFAULT_CONTACT_EMAIL: service support email
179
    * DEFAULT_FROM_EMAIL: from email
178
    * ASTAKOS_DEFAULT_CONTACT_EMAIL: service support email
179
    * ASTAKOS_DEFAULT_FROM_EMAIL: from email
180 180
    """
181 181
    status = None
182 182
    message = None
......
230 230
    In case of POST updates the user informantion and redirects to ``next``
231 231
    url parameter if exists.
232 232
    
233
    If the user isn't logged in, redirects to settings.ASTAKOS_LOGIN_URL.  
233
    If the user isn't logged in, redirects to settings.LOGIN_URL.
234 234
    
235 235
    **Arguments**
236 236
    
......
347 347
    In case of GET request renders a form for providing the feedback information.
348 348
    In case of POST sends an email to support team.
349 349
    
350
    If the user isn't logged in, redirects to settings.ASTAKOS_LOGIN_URL.  
350
    If the user isn't logged in, redirects to settings.LOGIN_URL.
351 351
    
352 352
    **Arguments**
353 353
    
......
365 365
    **Settings:**
366 366
    
367 367
    * LOGIN_URL: login uri
368
    * DEFAULT_CONTACT_EMAIL: List of feedback recipients
368
    * ASTAKOS_DEFAULT_CONTACT_EMAIL: List of feedback recipients
369 369
    """
370 370
    if request.method == 'GET':
371 371
        form = FeedbackForm()
b/astakos/settings.py
124 124
USE_X_FORWARDED_HOST = False
125 125

  
126 126
# Set umask (needed for gunicorn setup).
127
#umask(0077)
127
#umask(0077)
128

  
129
# The URL where requests are redirected for login, especially when using the login_required() decorator.
130
LOGIN_URL = '/im'

Also available in: Unified diff