Skip to content

Commit

Permalink
old website data (timezone) + few fix on login view + deleted forgott…
Browse files Browse the repository at this point in the history
…en useless views
  • Loading branch information
Nodraak committed Nov 2, 2014
1 parent 43ebd4d commit 493b0c4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 46 deletions.
40 changes: 1 addition & 39 deletions iTeam/member/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# @Author: Adrien Chardon
# @Date: 2014-08-20 18:26:44
# @Last Modified by: Adrien Chardon
# @Last Modified time: 2014-10-30 22:14:22
# @Last Modified time: 2014-11-02 18:56:36

# This file is part of iTeam.org.
# Copyright (C) 2014 Adrien Chardon (Nodraak).
Expand Down Expand Up @@ -195,41 +195,3 @@ def settings_view(request):
form = SettingsForm(request.user)

return render(request, 'member/settings_account.html', {'form': form})


@login_required
def publications(request):
profile = request.user.profile # login_required

if not profile.is_publisher:
raise PermissionDenied

publications_all = Publication.objects.all().filter(author=request.user).order_by('-pub_date')
publications_list = publications_all.filter(is_draft=False)
drafts_list = publications_all.filter(is_draft=True)

c = {
'publications_list': publications_list,
'drafts_list': drafts_list,
}

return render(request, 'member/publications.html', c)


@login_required
def events(request):
profile = request.user.profile # login_required

if not profile.is_publisher:
raise PermissionDenied

events_all = Event.objects.all().filter(author=request.user).order_by('-date_start')
events_list = events_all.filter(is_draft=False)
drafts_list = events_all.filter(is_draft=True)

c = {
'events_list': events_list,
'drafts_list': drafts_list,
}

return render(request, 'member/events.html', c)
11 changes: 4 additions & 7 deletions templates/member/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h1>

{% if not user.is_authenticated %}
<div class="row">
<div class="large-8 large-offset-2 columns">
<div class="large-12 columns">
<form method="post" action="{% url 'member:login_view' %}{% if next %}?next={{ next }}{% endif %}">
{% csrf_token %}

Expand All @@ -48,10 +48,10 @@ <h1>

{% for field in form %}
<div class="row">
<div class="large-5 columns">
<div class="large-3 large-offset-3 columns">
{{ field.label_tag }}
</div>
<div class="large-7 columns">
<div class="large-3 end columns">
{{ field }}
{% for error in field.errors %}
<small class="error">{{ error }}</small>
Expand All @@ -61,13 +61,10 @@ <h1>
{% endfor %}

<div class="row">
<div class="large-8 large-offset-2 columns">
<div class="large-12 columns" style="text-align: center;">
<button type="submit" class="button radius">
Se connecter
</button>
<a href="/" class="button radius secondary">
Annuler
</a>
</div>
</div>
</form>
Expand Down

0 comments on commit 493b0c4

Please sign in to comment.