From 66802f291d5e3612dbeef9a63a539ee580f7b106 Mon Sep 17 00:00:00 2001
From: Kelketek <kelketek@gmail.com>
Date: Mon, 22 Jul 2013 08:59:11 -0500
Subject: [PATCH] Updated news models to use custom user. No migration should
 be needed. Updated website templates.

---
 src/settings_default.py                            | 2 +-
 src/web/news/models.py                             | 4 +++-
 src/web/templates/prosimii/index.html              | 2 +-
 src/web/templates/prosimii/registration/login.html | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/settings_default.py b/src/settings_default.py
index f54b2bc332..02e1235620 100644
--- a/src/settings_default.py
+++ b/src/settings_default.py
@@ -486,7 +486,7 @@ INSTALLED_APPS = (
     'src.comms',
     'src.help',
     'src.scripts',
-    #'src.web.news',
+    'src.web.news',
     'src.web.website',)
 # The user profile extends the User object with more functionality;
 # This should usually not be changed.
diff --git a/src/web/news/models.py b/src/web/news/models.py
index 9ea8f54953..d89d3362df 100755
--- a/src/web/news/models.py
+++ b/src/web/news/models.py
@@ -5,7 +5,9 @@
 #
 
 from django.db import models
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
+
+User = get_user_model()
 
 class NewsTopic(models.Model):
     """
diff --git a/src/web/templates/prosimii/index.html b/src/web/templates/prosimii/index.html
index c4b9d377bc..ff98d70eb0 100644
--- a/src/web/templates/prosimii/index.html
+++ b/src/web/templates/prosimii/index.html
@@ -58,7 +58,7 @@
       <h1>Recently Connected</h1>
       <ul>
       {% for player in players_connected_recent %}
-      <li>{{player.user.username}} -- <em>{{player.user.last_login|timesince}} ago</em></li>
+      <li>{{player.username}} -- <em>{{player.last_login|timesince}} ago</em></li>
       {% endfor %}
       </ul>
       <p class="filler"><!-- Filler para to extend left vertical line --></p>
diff --git a/src/web/templates/prosimii/registration/login.html b/src/web/templates/prosimii/registration/login.html
index 94e312e1cd..4497a9aaa8 100644
--- a/src/web/templates/prosimii/registration/login.html
+++ b/src/web/templates/prosimii/registration/login.html
@@ -13,7 +13,8 @@ Login
       <p>Your username and password didn't match. Please try again.</p>
    {% endif %}
 
-   <form method="post" action="."{% csrf_token %} >
+   <form method="post" action=".">
+      {% csrf_token %}
       <table>
          <tr>
             <td><label for="id_username">Username:</label></td>