perelman
/
avalon-django
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for new version of Django. Some warnings remain.

Browse Source
master
Daniel Perelman 2 months ago
parent b69b21d518
commit 2ea08f804d
5 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File

30
avalon/avalon/settings.py
Unescape Escape View File

@ -32,23 +32,13 @@ ALLOWED_HOSTS = []
INSTALLED_APPS = [
'avalon_game.apps.AvalonGameConfig',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
]
MIDDLEWARE_CLASSES = [
# Does not exist in Django before 1.8.
#'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]
@ -63,7 +53,6 @@ TEMPLATES = [
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
},
@ -88,25 +77,6 @@ DATABASES = {
}
# Password validation
# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [
{
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
]
# Internationalization
# https://docs.djangoproject.com/en/1.9/topics/i18n/

2
avalon/avalon/urls.py
Unescape Escape View File

@ -15,9 +15,7 @@ Including another URLconf
3. Add a URL to urlpatterns: url(r'^blog/', include(blog_urls))
"""
from django.conf.urls import include, url
from django.contrib import admin
urlpatterns = [
url(r'^', include('avalon_game.urls')),
url(r'^admin/', admin.site.urls),
]

6
avalon/avalon_game/models.py
Unescape Escape View File

@ -29,11 +29,13 @@ class Game(models.Model):
display_history = models.NullBooleanField()
private_voting = models.NullBooleanField()
player_assassinated = models.ForeignKey('Player', null=True, default=None,
related_name='+')
related_name='+',
on_delete=models.PROTECT)
created = models.DateTimeField()
ended = models.DateTimeField(null=True, default=None)
next_game = models.OneToOneField('self', null=True, default=None,
related_name='previous_game')
related_name='previous_game',
on_delete=models.SET_DEFAULT)
# from http://stackoverflow.com/a/11821832
def save(self, *args, **kwargs):

2
avalon/avalon_game/templates/base.html
Unescape Escape View File

@ -1,4 +1,4 @@
{% load staticfiles %}
{% load static %}
<head>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>

2
avalon/avalon_game/views.py
Unescape Escape View File

@ -205,7 +205,7 @@ def game_base_context(game, player):
context['num_resistance'] = len([p for p in players if not p.is_spy()])
resistance_roles = [p.role_string() for p in players
if not p.is_spy() and p.role != Player.ROLE_GOOD]
if resistance_roles:
if resistance_roles and all(r is not None for r in resistance_roles):
resistance_roles.sort()
context['resistance_roles'] = resistance_roles

Write Preview
Loading…
Cancel
Save