Revision 92defad4 astakos/im/admin/views.py

b/astakos/im/admin/views.py
39 39
from math import ceil
40 40
from smtplib import SMTPException
41 41

  
42
from django.conf import settings
43 42
from django.core.mail import send_mail
44 43
from django.http import HttpResponse, HttpResponseRedirect
45 44
from django.shortcuts import redirect
......
56 55
from astakos.im.views import render_response, index
57 56
from astakos.im.admin.forms import AdminProfileForm
58 57
from astakos.im.admin.forms import AdminUserCreationForm
59

  
58
from astakos.im.settings import BYPASS_ADMIN_AUTH, ADMIN_PAGE_LIMIT, DEFAULT_CONTACT_EMAIL, DEFAULT_FROM_EMAIL
60 59
def requires_admin(func):
61 60
    """
62 61
    Decorator checkes whether the request.user is a superuser and if not
......
64 63
    """
65 64
    @wraps(func)
66 65
    def wrapper(request, *args):
67
        if not settings.BYPASS_ADMIN_AUTH:
66
        if not BYPASS_ADMIN_AUTH:
68 67
            if request.user.is_anonymous():
69 68
                next = urlencode({'next': request.build_absolute_uri()})
70 69
                login_uri = reverse(index) + '?' + next
......
160 159
        page = int(request.GET.get('page', 1))
161 160
    except ValueError:
162 161
        page = 1
163
    offset = max(0, page - 1) * settings.ADMIN_PAGE_LIMIT
164
    limit = offset + settings.ADMIN_PAGE_LIMIT
162
    offset = max(0, page - 1) * ADMIN_PAGE_LIMIT
163
    limit = offset + ADMIN_PAGE_LIMIT
165 164
    
166
    npages = int(ceil(1.0 * users.count() / settings.ADMIN_PAGE_LIMIT))
165
    npages = int(ceil(1.0 * users.count() / ADMIN_PAGE_LIMIT))
167 166
    prev = page - 1 if page > 1 else None
168 167
    next = page + 1 if page < npages else None
169 168
    
......
285 284
        page = int(request.GET.get('page', 1))
286 285
    except ValueError:
287 286
        page = 1
288
    offset = max(0, page - 1) * settings.ADMIN_PAGE_LIMIT
289
    limit = offset + settings.ADMIN_PAGE_LIMIT
287
    offset = max(0, page - 1) * ADMIN_PAGE_LIMIT
288
    limit = offset + ADMIN_PAGE_LIMIT
290 289
    
291
    npages = int(ceil(1.0 * users.count() / settings.ADMIN_PAGE_LIMIT))
290
    npages = int(ceil(1.0 * users.count() / ADMIN_PAGE_LIMIT))
292 291
    prev = page - 1 if page > 1 else None
293 292
    next = page + 1 if page < npages else None
294 293
    kwargs = {'users':users[offset:limit],
......
309 308
                'url': sitedomain,
310 309
                'baseurl': baseurl,
311 310
                'site_name': sitename,
312
                'support': settings.DEFAULT_CONTACT_EMAIL % sitename.lower()})
313
    sender = settings.DEFAULT_FROM_EMAIL % sitename
311
                'support': DEFAULT_CONTACT_EMAIL % sitename.lower()})
312
    sender = DEFAULT_FROM_EMAIL % sitename
314 313
    send_mail(subject, message, sender, [user.email])
315 314
    logging.info('Sent greeting %s', user)
316 315

  
......
369 368
        page = int(request.POST.get('page', 1))
370 369
    except ValueError:
371 370
        page = 1
372
    offset = max(0, page - 1) * settings.ADMIN_PAGE_LIMIT
373
    limit = offset + settings.ADMIN_PAGE_LIMIT
371
    offset = max(0, page - 1) * ADMIN_PAGE_LIMIT
372
    limit = offset + ADMIN_PAGE_LIMIT
374 373
    
375
    npages = int(ceil(1.0 * users.count() / settings.ADMIN_PAGE_LIMIT))
374
    npages = int(ceil(1.0 * users.count() / ADMIN_PAGE_LIMIT))
376 375
    prev = page - 1 if page > 1 else None
377 376
    next = page + 1 if page < npages else None
378 377
    kwargs = {'users':users[offset:limit],
......
427 426
        page = int(request.GET.get('page', 1))
428 427
    except ValueError:
429 428
        page = 1
430
    offset = max(0, page - 1) * settings.ADMIN_PAGE_LIMIT
431
    limit = offset + settings.ADMIN_PAGE_LIMIT
429
    offset = max(0, page - 1) * ADMIN_PAGE_LIMIT
430
    limit = offset + ADMIN_PAGE_LIMIT
432 431
    
433
    npages = int(ceil(1.0 * invitations.count() / settings.ADMIN_PAGE_LIMIT))
432
    npages = int(ceil(1.0 * invitations.count() / ADMIN_PAGE_LIMIT))
434 433
    prev = page - 1 if page > 1 else None
435 434
    next = page + 1 if page < npages else None
436 435
    kwargs = {'invitations':invitations[offset:limit],

Also available in: Unified diff