Skip to content

CIRCLE / cloud

Go to a project

A prog2-höz tartozó friss repo anyagok itt elérhetőek: https://git.iit.bme.hu/

Commit 479ac733 by Dudás Ádám
Options

school: refactored views

parent a01df009
Showing with 53 additions and 53 deletions
school/views.py
...@@ -29,10 +29,12 @@ from django.views.decorators.csrf import ensure_csrf_cookie ...@@ -29,10 +29,12 @@ from django.views.decorators.csrf import ensure_csrf_cookie
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def logout(request): def logout(request):
auth.logout(request) auth.logout(request)
return redirect('/Shibboleth.sso/Logout?return=https%3a%2f%2fcloud.ik.bme.hu%2f') return redirect('/Shibboleth.sso/Logout?return=https%3a%2f%2fcloud.ik.bme.hu%2f')
@ensure_csrf_cookie @ensure_csrf_cookie
def login(request): def login(request):
try: try:
...@@ -55,18 +57,14 @@ def login(request): ...@@ -55,18 +57,14 @@ def login(request):
p.user_id = user.id p.user_id = user.id
p.save() p.save()
try:
sem = Semester.get_current() sem = Semester.get_current()
attended = request.META['niifEduPersonAttendedCourse'] attended = request.META['niifEduPersonAttendedCourse']
if attended == '': attended = [c for c in attended.split(';') if c != '']
attended = []
else:
attended = attended.split(';')
for c in attended: for c in attended:
try: try:
co = Course.objects.get(code=c) co = Course.objects.get(code=c)
except Exception as e: except Course.DoesNotExist as e:
logger.warning("Django could not get Course %s: %s" % (c, e)) logger.warning("Django could not get Course %s: %s" % (c, e))
continue continue
g = co.get_or_create_default_group() g = co.get_or_create_default_group()
...@@ -74,30 +72,29 @@ def login(request): ...@@ -74,30 +72,29 @@ def login(request):
try: try:
g.members.add(p) g.members.add(p)
g.save() g.save()
messages.info(request, _('Course "%s" added.') % g.course) messages.info(request,
logger.warning('Django Course "%s" added.' % g.course) _('Course "%s" added.') % g.course)
logger.info('Django Course "%s" added.' % g.course)
except Exception as e: except Exception as e:
messages.error(request, _('Failed to add course "%s".') % g.course) messages.error(request,
_('Failed to add course "%s".') % g.course)
logger.warning("Django ex %s" % e) logger.warning("Django ex %s" % e)
except ValidationError as e:
logger.warning("Django ex4 %s" % e)
held = request.META['niifEduPersonHeldCourse'] held = request.META['niifEduPersonHeldCourse']
if held == '': held = [c for c in held.split(';') if c != '']
held = []
else:
held = held.split(';')
for c in held: for c in held:
co, created = Course.objects.get_or_create(code=c) co, created = Course.objects.get_or_create(code=c)
if created: if created:
logger.warning("Django Course %s created" % c) logger.info("Django Course %s created" % c)
g = co.get_or_create_default_group() g = co.get_or_create_default_group()
try: try:
co.owners.add(p) co.owners.add(p)
g.owners.add(p) g.owners.add(p)
messages.info(request, _('Course "%s" ownership added.') % g.course) messages.info(request,
_('Course "%s" ownership added.') % g.course)
except Exception as e: except Exception as e:
messages.error(request, _('Failed to add course "%s" ownership.') % g.course) messages.error(request,
_('Failed to add course "%s" ownership.') % g.course)
logger.warning("Django ex %s" % e) logger.warning("Django ex %s" % e)
co.save() co.save()
g.save() g.save()
...@@ -106,20 +103,19 @@ def login(request): ...@@ -106,20 +103,19 @@ def login(request):
affiliation = request.META['affiliation'] affiliation = request.META['affiliation']
except KeyError: except KeyError:
affiliation = '' affiliation = ''
if affiliation == '':
affiliation = [] affiliation = [a for a in affiliation.split(';') if a != '']
else:
affiliation = affiliation.split(';')
for a in affiliation: for a in affiliation:
g, created = AGroup.objects.get_or_create(name=a) g, created = AGroup.objects.get_or_create(name=a)
user.groups.add(g) user.groups.add(g)
try: try:
g = Group.objects.filter(name=a)[0] g = Group.objects.get(name=a)
g.members.add(p) g.members.add(p)
g.save() g.save()
logger.warning("Django affiliation group %s added to %s" % (a, p)) logger.info("Django affiliation group %s added to %s" % (a, p))
except Exception as e: except Exception as e:
logger.warning("Django FAIL affiliation group %s added to %s %s" % (a, p, e)) logger.warning("Django FAILed to add affiliation group %s to %s."
" Reason: %s" % (a, p, e))
user.save() user.save()
p.save() p.save()
...@@ -127,46 +123,46 @@ def login(request): ...@@ -127,46 +123,46 @@ def login(request):
auth.login(request, user) auth.login(request, user)
logger.warning("Shib login with %s" % request.META) logger.warning("Shib login with %s" % request.META)
redirect_to = request.REQUEST.get(auth.REDIRECT_FIELD_NAME, '') redirect_to = request.REQUEST.get(auth.REDIRECT_FIELD_NAME, '')
if not is_safe_url(url=redirect_to, host=request.get_host()): if not is_safe_url(url=redirect_to, host=request.get_host()):
redirect_to = settings.LOGIN_REDIRECT_URL redirect_to = settings.LOGIN_REDIRECT_URL
response = redirect(redirect_to) response = redirect(redirect_to)
response.set_cookie(settings.LANGUAGE_COOKIE_NAME, p.language, 10*365*24*3600) response.set_cookie(
settings.LANGUAGE_COOKIE_NAME, p.language, 10 * 365 * 24 * 3600)
return response return response
def language(request, lang):
cname = settings.LANGUAGE_COOKIE_NAME
if not cname:
cname = 'django_language'
redirect_to = request.META['HTTP_REFERER']
r = redirect(redirect_to)
if not redirect_to:
redirect_to = "/"
def language(request, lang):
try: try:
p = Person.objects.get(user=request.user) p = Person.objects.get(user=request.user)
p.language = lang p.language = lang
p.save() p.save()
except ValidationError as e: except ValidationError as e: # couldn't test this case
messages.error(e) messages.error(request, e)
except: except Person.DoesNotExist:
messages.error(_("Could not found Person object.")) messages.error(request, _("Could not find Person object."))
r.set_cookie(cname, lang, 10*365*24*3600)
cname = settings.LANGUAGE_COOKIE_NAME or 'django_language'
redirect_to = request.META['HTTP_REFERER']
r = redirect(redirect_to)
r.set_cookie(cname, lang, 10 * 365 * 24 * 3600)
return r return r
@login_required @login_required
def group_show(request, gid): def group_show(request, gid):
user = request.user user = request.user
group = get_object_or_404(Group, id=gid) group = get_object_or_404(Group, id=gid)
mytemplates = [t for t in Template.objects.filter(owner=request.user).all()] mytemplates = [
t for t in Template.objects.filter(owner=request.user).all()]
noshare = True noshare = True
for i, t in enumerate(mytemplates): for i, t in enumerate(mytemplates):
t.myshares = t.share_set.filter(group=group) t.myshares = t.share_set.filter(group=group)
if t.myshares.exists(): if t.myshares.exists():
noshare = False noshare = False
mytemplates[i] = t mytemplates[i] = t
publictemplates = [t for t in Template.objects.filter(public=True, state='READY').all()] publictemplates = [
t for t in Template.objects.filter(public=True, state='READY').all()]
for i, t in enumerate(publictemplates): for i, t in enumerate(publictemplates):
t.myshares = t.share_set.filter(group=group) t.myshares = t.share_set.filter(group=group)
if t.myshares.exists(): if t.myshares.exists():
...@@ -182,6 +178,7 @@ def group_show(request, gid): ...@@ -182,6 +178,7 @@ def group_show(request, gid):
'owners': group.owners.all(), 'owners': group.owners.all(),
})) }))
@login_required @login_required
def group_new(request): def group_new(request):
name = request.POST['name'] name = request.POST['name']
...@@ -189,7 +186,7 @@ def group_new(request): ...@@ -189,7 +186,7 @@ def group_new(request):
members_list = re.split('\r?\n', request.POST['members']) members_list = re.split('\r?\n', request.POST['members'])
members = [] members = []
for member in members_list: for member in members_list:
if re.match('^[a-zA-Z][a-zA-Z0-9]{5}$', member.strip()) == None: if re.match('^[a-zA-Z][a-zA-Z0-9]{5}$', member.strip()) is None:
messages.error(request, _('Invalid NEPTUN code found.')) messages.error(request, _('Invalid NEPTUN code found.'))
return redirect('/') return redirect('/')
person, created = Person.objects.get_or_create(code=member) person, created = Person.objects.get_or_create(code=member)
...@@ -205,11 +202,12 @@ def group_new(request): ...@@ -205,11 +202,12 @@ def group_new(request):
group.save() group.save()
return redirect('/group/show/%s' % group.id) return redirect('/group/show/%s' % group.id)
@login_required @login_required
def group_ajax_add_new_member(request, gid): def group_ajax_add_new_member(request, gid):
group = get_object_or_404(Group, id=gid) group = get_object_or_404(Group, id=gid)
member = request.POST['neptun'] member = request.POST['neptun']
if re.match('^[a-zA-Z][a-zA-Z0-9]{5}$', member.strip()) == None: if re.match('^[a-zA-Z][a-zA-Z0-9]{5}$', member.strip()) is None:
status = json.dumps({'status': 'Error'}) status = json.dumps({'status': 'Error'})
messages.error(request, _('Invalid NEPTUN code')) messages.error(request, _('Invalid NEPTUN code'))
return HttpResponse(status) return HttpResponse(status)
...@@ -220,11 +218,12 @@ def group_ajax_add_new_member(request, gid): ...@@ -220,11 +218,12 @@ def group_ajax_add_new_member(request, gid):
'status': 'OK' 'status': 'OK'
})) }))
@login_required @login_required
def group_ajax_remove_member(request, gid): def group_ajax_remove_member(request, gid):
group = get_object_or_404(Group, id=gid) group = get_object_or_404(Group, id=gid)
member = request.POST['neptun'] member = request.POST['neptun']
if re.match('^[a-zA-Z][a-zA-Z0-9]{5}$', member) == None: if re.match('^[a-zA-Z][a-zA-Z0-9]{5}$', member) is None:
status = json.dumps({'status': 'Error'}) status = json.dumps({'status': 'Error'})
messages.error(request, _('Invalid NEPTUN code')) messages.error(request, _('Invalid NEPTUN code'))
return HttpResponse(status) return HttpResponse(status)
...@@ -235,6 +234,7 @@ def group_ajax_remove_member(request, gid): ...@@ -235,6 +234,7 @@ def group_ajax_remove_member(request, gid):
'status': 'OK' 'status': 'OK'
})) }))
@login_required @login_required
def group_ajax_delete(request): def group_ajax_delete(request):
group = get_object_or_404(Group, id=request.POST['gid']) group = get_object_or_404(Group, id=request.POST['gid'])
...@@ -243,27 +243,27 @@ def group_ajax_delete(request): ...@@ -243,27 +243,27 @@ def group_ajax_delete(request):
'status': 'OK' 'status': 'OK'
})) }))
@login_required @login_required
def group_ajax_owner_autocomplete(request): def group_ajax_owner_autocomplete(request):
users = (
User.objects.filter(last_name__istartswith=request.POST['q'])[:5] +
User.objects.filter(first_name__istartswith=request.POST['q'])[:5] +
User.objects.filter(username__istartswith=request.POST['q'])[:5])
results = map(lambda u: { results = map(lambda u: {
'name': u.get_full_name(), 'name': u.get_full_name(),
'neptun': u.username }, User.objects.filter(last_name__istartswith=request.POST['q'])[:5]) 'neptun': u.username}, users)
results += map(lambda u: {
'name': u.get_full_name(),
'neptun': u.username }, User.objects.filter(first_name__istartswith=request.POST['q'])[:5])
results += map(lambda u: {
'name': u.get_full_name(),
'neptun': u.username }, User.objects.filter(username__istartswith=request.POST['q'])[:5])
return HttpResponse(json.dumps(results, ensure_ascii=False)) return HttpResponse(json.dumps(results, ensure_ascii=False))
@login_required @login_required
def group_ajax_add_new_owner(request, gid): def group_ajax_add_new_owner(request, gid):
if request.user.cloud_details.share_quota == 0: if request.user.cloud_details.share_quota == 0:
return HttpResponse({'status': 'denied'}) return HttpResponse({'status': 'denied'})
group = get_object_or_404(Group, id=gid) group = get_object_or_404(Group, id=gid)
member = request.POST['neptun'] member = request.POST['neptun']
if re.match('^[a-zA-Z][a-zA-Z0-9]{5}$', member.strip()) == None: if re.match('^[a-zA-Z][a-zA-Z0-9]{5}$', member.strip()) is None:
status = json.dumps({'status': 'Error'}) status = json.dumps({'status': 'Error'})
messages.error(request, _('Invalid NEPTUN code')) messages.error(request, _('Invalid NEPTUN code'))
return HttpResponse(status) return HttpResponse(status)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment