flake8, isort
This commit is contained in:
parent
21d65e936d
commit
3b13423bd2
|
@ -1,6 +1,6 @@
|
|||
from django.contrib import admin
|
||||
|
||||
from accounts.models import PonyConfUser
|
||||
|
||||
from accounts.models import PonyConfSpeaker, PonyConfUser
|
||||
|
||||
admin.site.register(PonyConfUser)
|
||||
admin.site.register(PonyConfSpeaker)
|
||||
|
|
|
@ -1,14 +1,11 @@
|
|||
from django.forms.models import modelform_factory
|
||||
from django.contrib.auth.models import User
|
||||
from django.forms.models import modelform_factory
|
||||
|
||||
from .models import PonyConfUser
|
||||
|
||||
|
||||
__all__ = ['ProfileForm', 'PonyConfUserForm']
|
||||
|
||||
|
||||
ProfileForm = modelform_factory(User,
|
||||
fields=['first_name', 'last_name', 'email', 'username'])
|
||||
ProfileForm = modelform_factory(User, fields=['first_name', 'last_name', 'email', 'username'])
|
||||
|
||||
PonyConfUserForm = modelform_factory(PonyConfUser,
|
||||
fields=['biography'])
|
||||
PonyConfUserForm = modelform_factory(PonyConfUser, fields=['biography'])
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
# Generated by Django 1.9.7 on 2016-06-11 12:23
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
from __future__ import unicode_literals
|
||||
|
||||
import django.contrib.sites.managers
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
import django.db.models.manager
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
|
|
@ -1,18 +1,17 @@
|
|||
from enum import IntEnum
|
||||
|
||||
from django.db import models
|
||||
from django.contrib.sites.models import Site
|
||||
from django.contrib.sites.managers import CurrentSiteManager
|
||||
|
||||
from django.contrib.auth.models import User
|
||||
from django.contrib.sites.managers import CurrentSiteManager
|
||||
from django.contrib.sites.models import Site
|
||||
from django.db import models
|
||||
|
||||
|
||||
__all__ = [ 'PonyConfUser', 'PonyConfSpeaker' ]
|
||||
__all__ = ['PonyConfUser', 'PonyConfSpeaker']
|
||||
|
||||
|
||||
def enum_to_choices(enum):
|
||||
return ((item.value, item.name) for item in list(enum))
|
||||
|
||||
|
||||
class PonyConfUser(models.Model):
|
||||
|
||||
user = models.OneToOneField(User)
|
||||
|
|
|
@ -3,7 +3,6 @@ from django.contrib.auth import views as auth_views
|
|||
|
||||
from accounts import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^login/$', auth_views.login, {'template_name': 'accounts/login.html'}, name='login'),
|
||||
url(r'^logout/$', auth_views.logout, {'next_page': '/'}, name='logout'),
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
from django.shortcuts import render, redirect, get_object_or_404
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.contrib.auth.forms import PasswordChangeForm
|
||||
from django.contrib.auth.views import password_change
|
||||
from django.contrib import messages
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.contrib.auth.views import password_change
|
||||
from django.shortcuts import render
|
||||
|
||||
from .forms import ProfileForm, PonyConfUserForm
|
||||
from .forms import PonyConfUserForm, ProfileForm
|
||||
|
||||
|
||||
@login_required
|
||||
|
|
|
@ -151,12 +151,12 @@ BOOTSTRAP3 = {
|
|||
|
||||
# The URL to the jQuery JavaScript file
|
||||
# If not set, "build-in" CDN is used (maxcdn)
|
||||
#'jquery_url': '//code.jquery.com/jquery.min.js',
|
||||
# 'jquery_url': '//code.jquery.com/jquery.min.js',
|
||||
'jquery_url': STATIC_URL + 'jquery/dist/jquery.js',
|
||||
|
||||
# The Bootstrap base URL
|
||||
# If not set, "build-in" CDN is used (maxcdn)
|
||||
#'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.2.0/',
|
||||
# 'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.2.0/',
|
||||
'base_url': STATIC_URL + 'bootstrap/dist/',
|
||||
|
||||
# The complete URL to the Bootstrap CSS file
|
||||
|
|
|
@ -13,10 +13,9 @@ Including another URLconf
|
|||
1. Import the include() function: from django.conf.urls import url, include
|
||||
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
|
||||
"""
|
||||
from django.conf.urls import url, include
|
||||
from django.conf.urls import include, url
|
||||
from django.contrib import admin
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^admin/', admin.site.urls),
|
||||
url(r'^accounts/', include('accounts.urls')),
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
from django.contrib import admin
|
||||
|
||||
from proposals.models import *
|
||||
|
||||
from proposals.models import Speach, Talk, Topic
|
||||
|
||||
admin.site.register(Topic)
|
||||
admin.site.register(Talk)
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
from django.forms.models import modelform_factory
|
||||
|
||||
from proposals.models import *
|
||||
|
||||
from proposals.models import Talk
|
||||
|
||||
__all__ = ['TalkForm']
|
||||
|
||||
|
|
|
@ -2,10 +2,11 @@
|
|||
# Generated by Django 1.9.6 on 2016-06-02 21:26
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import autoslug.fields
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
import autoslug.fields
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
|
|
@ -2,9 +2,10 @@
|
|||
# Generated by Django 1.9.6 on 2016-06-02 21:52
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import autoslug.fields
|
||||
from django.db import migrations
|
||||
|
||||
import autoslug.fields
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
from __future__ import unicode_literals
|
||||
|
||||
import django.contrib.sites.managers
|
||||
from django.db import migrations
|
||||
import django.db.models.manager
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
# Generated by Django 1.9.7 on 2016-06-11 13:05
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
|
|
@ -1,13 +1,11 @@
|
|||
from django.db import models
|
||||
from django.contrib.sites.models import Site
|
||||
from django.contrib.sites.managers import CurrentSiteManager
|
||||
|
||||
from autoslug import AutoSlugField
|
||||
from django.contrib.sites.models import Site
|
||||
from django.db import models
|
||||
|
||||
from accounts.models import PonyConfSpeaker
|
||||
from autoslug import AutoSlugField
|
||||
|
||||
|
||||
__all__ = [ 'Topic', 'Talk', 'Speach' ]
|
||||
__all__ = ['Topic', 'Talk', 'Speach']
|
||||
|
||||
|
||||
class Topic(models.Model):
|
||||
|
|
|
@ -2,7 +2,6 @@ from django.conf.urls import url
|
|||
|
||||
from proposals import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^$', views.home, name='home'),
|
||||
url(r'^talk/$', views.talk_list, name='list-talks'),
|
||||
|
|
|
@ -1,17 +1,18 @@
|
|||
from django.shortcuts import render, redirect, get_object_or_404
|
||||
from django.contrib.sites.shortcuts import get_current_site
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.contrib import messages
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.contrib.sites.shortcuts import get_current_site
|
||||
from django.core.exceptions import PermissionDenied
|
||||
from django.shortcuts import get_object_or_404, redirect, render
|
||||
|
||||
from accounts.models import *
|
||||
from proposals.models import *
|
||||
from proposals.forms import *
|
||||
from accounts.models import PonyConfSpeaker, PonyConfUser
|
||||
from proposals.forms import TalkForm
|
||||
from proposals.models import Speach, Talk, Topic
|
||||
|
||||
|
||||
def home(request):
|
||||
return render(request, 'proposals/home.html')
|
||||
|
||||
|
||||
@login_required
|
||||
def talk_list(request):
|
||||
speaker = PonyConfSpeaker.on_site.filter(user=request.user.ponyconfuser)
|
||||
|
@ -27,6 +28,7 @@ def talk_list(request):
|
|||
'other_talks': others,
|
||||
})
|
||||
|
||||
|
||||
@login_required
|
||||
def talk_list_by_topic(request, topic):
|
||||
topic = get_object_or_404(Topic, site=get_current_site(request), slug=topic)
|
||||
|
@ -36,6 +38,7 @@ def talk_list_by_topic(request, topic):
|
|||
'talks': talks,
|
||||
})
|
||||
|
||||
|
||||
@login_required
|
||||
def talk_list_by_speaker(request, speaker):
|
||||
speaker = get_object_or_404(PonyConfSpeaker, user__user__username=speaker)
|
||||
|
@ -45,13 +48,15 @@ def talk_list_by_speaker(request, speaker):
|
|||
'talks': talks,
|
||||
})
|
||||
|
||||
|
||||
@login_required
|
||||
def talk_edit(request, talk=None):
|
||||
if talk:
|
||||
talk = get_object_or_404(Talk, slug=talk)
|
||||
if talk.site != get_current_site(request):
|
||||
raise PermissionDenied()
|
||||
if not request.user.is_superuser and not talk.speakers.filter(username=request.user.username).exists(): # FIXME fine permissions
|
||||
if not request.user.is_superuser and not talk.speakers.filter(username=request.user.username).exists():
|
||||
# FIXME fine permissions
|
||||
raise PermissionDenied()
|
||||
form = TalkForm(request.POST or None, instance=talk)
|
||||
if request.method == 'POST' and form.is_valid():
|
||||
|
@ -72,6 +77,7 @@ def talk_edit(request, talk=None):
|
|||
'form': form,
|
||||
})
|
||||
|
||||
|
||||
@login_required
|
||||
def talk_details(request, talk):
|
||||
talk = get_object_or_404(Talk, slug=talk)
|
||||
|
@ -79,6 +85,7 @@ def talk_details(request, talk):
|
|||
'talk': talk,
|
||||
})
|
||||
|
||||
|
||||
@login_required
|
||||
def topic_list(request):
|
||||
topics = Topic.on_site.all()
|
||||
|
@ -86,6 +93,7 @@ def topic_list(request):
|
|||
'topics': topics,
|
||||
})
|
||||
|
||||
|
||||
@login_required
|
||||
def speaker_list(request):
|
||||
speakers = PonyConfSpeaker.on_site.all()
|
||||
|
@ -93,6 +101,7 @@ def speaker_list(request):
|
|||
'speaker': speakers,
|
||||
})
|
||||
|
||||
|
||||
@login_required
|
||||
def user_details(request, username):
|
||||
user = get_object_or_404(PonyConfUser, user__username=username)
|
||||
|
|
Loading…
Reference in New Issue