From f9999119e2c5a2e2e3afc15e25162766e1b402c1 Mon Sep 17 00:00:00 2001
From: Johnny <strikax@gmail.com>
Date: Wed, 24 Oct 2018 00:55:37 +0000
Subject: [PATCH] Housekeeping.

---
 evennia/web/utils/general_context.py             | 8 ++++++++
 evennia/web/website/templates/website/_menu.html | 4 ++--
 evennia/web/website/views.py                     | 5 +++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/evennia/web/utils/general_context.py b/evennia/web/utils/general_context.py
index 44bc8b3cb3..57b46bf59a 100644
--- a/evennia/web/utils/general_context.py
+++ b/evennia/web/utils/general_context.py
@@ -67,7 +67,15 @@ def general_context(request):
     Returns common Evennia-related context stuff, which
     is automatically added to context of all views.
     """
+    account = None
+    if request.user.is_authenticated(): account = request.user
+    
+    puppet = None
+    if request.session.get('puppet'): puppet = request.session['puppet']
+    
     return {
+        'account': account,
+        'puppet': puppet,
         'game_name': GAME_NAME,
         'game_slogan': GAME_SLOGAN,
         'evennia_userapps': ACCOUNT_RELATED,
diff --git a/evennia/web/website/templates/website/_menu.html b/evennia/web/website/templates/website/_menu.html
index f75477ecae..e82db1ca58 100644
--- a/evennia/web/website/templates/website/_menu.html
+++ b/evennia/web/website/templates/website/_menu.html
@@ -39,14 +39,14 @@ folder and edit it to add/remove links to the menu.
             {% block navbar_right %}
             {% endblock %}
             {% block navbar_user %}
-            {% if user.is_authenticated %}
+            {% if account %}
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" id="user_options" aria-expanded="false">Logged in as {{user.username}} <span class="caret"></span></a>
               <div class="dropdown-menu" aria-labelledby="user_options">
                 <a class="dropdown-item" href="{% url 'character-create' %}">Create Character</a>
                 <a class="dropdown-item" href="{% url 'character-manage' %}">Manage Characters</a>
                 <div class="dropdown-divider"></div>
-                {% for character in user.characters|slice:"10" %}
+                {% for character in account.characters|slice:"10" %}
                   <a class="dropdown-item" href="#">{{ character }}</a>
                 {% empty %} 
                   <a class="dropdown-item" href="#">No characters found!</a>
diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py
index 738c445061..f07e7f80f0 100644
--- a/evennia/web/website/views.py
+++ b/evennia/web/website/views.py
@@ -328,7 +328,7 @@ class CharacterMixin(object):
     
     def get_queryset(self):
         # Get IDs of characters owned by account
-        ids = [getattr(x, 'id') for x in self.request.user.db._playable_characters if x]
+        ids = [getattr(x, 'id') for x in self.request.user.characters if x]
         
         # Return a queryset consisting of those characters
         return self.model.objects.filter(id__in=ids).order_by(Lower('db_key'))
@@ -337,7 +337,7 @@ class CharacterManageView(LoginRequiredMixin, CharacterMixin, ListView):
 
     paginate_by = 10
     template_name = 'website/character_manage_list.html'
-    page_title = 'Manage: Characters'
+    page_title = 'Manage Characters'
         
 class CharacterUpdateView(CharacterMixin, ObjectUpdateView):
     
@@ -390,6 +390,7 @@ class CharacterCreateView(CharacterMixin, ObjectCreateView):
             [setattr(character.db, key, value) for key,value in self.attributes.items()]
             character.db.creator_id = account.id
             character.save()
+            account.save()
             
         except Exception as e:
             messages.error(self.request, "There was an error creating your character. If this problem persists, contact an admin.")