layout tidying

core/models_survex.py

@@ -130,11 +130,11 @@ class SurvexBlock(models.Model):
 
     def GetPersonroles(self):
         res = [ ]
-        for personrole in self.personrole_set.order_by('personexpedition'):
+        for personrole in self.survexpersonrole_set.order_by('personexpedition'):
             if res and res[-1]['person'] == personrole.personexpedition.person:
-                res[-1]['roles'] += ", " + str(personrole.role)
+                res[-1]['roles'] += ", " + str(personrole.nrole)
             else:
-                res.append({'person':personrole.personexpedition.person, 'expeditionyear':personrole.personexpedition.expedition.year, 'roles':str(personrole.role)})
+                res.append({'person':personrole.personexpedition.person, 'expeditionyear':personrole.personexpedition.expedition.year, 'roles':str(personrole.nrole)})
         return res
    
     def DayIndex(self):

settings.py

@@ -124,7 +124,6 @@ INSTALLED_APPS = (
     'registration', # only for expo user. REPLACE using django.contrib.auth
     'troggle.core',
     'troggle.flatpages', # Written by Martin Green 2011. This is NOT django.contrib.flatpages which stores HTML in the database
-#    'troggle.profiles', # Commented out, but keep until user/login system fully bedded down.
 )
 
 MIDDLEWARE_CLASSES = (

templates/svxfile.html

@@ -48,6 +48,7 @@ $(document).ready(function()
 </p>
 {% endif %}
 
+
 <form id="codewikiform" action="" method="POST">{% csrf_token %}
     <div class="codeframebit">{{form.code}}</div>
     <div style="display:none">{{form.filename}} {{form.dirname}} {{form.datetime}} {{form.outputtype}}</div>
@@ -75,4 +76,5 @@ $(document).ready(function()
 {% endif %}
 </div>
 
+
 {% endblock %}