diff options
| -rw-r--r-- | core/models_survex.py | 6 | ||||
| -rw-r--r-- | settings.py | 1 | ||||
| -rw-r--r-- | templates/svxfile.html | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/core/models_survex.py b/core/models_survex.py index 569bbb0..deb70f4 100644 --- a/core/models_survex.py +++ b/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): diff --git a/settings.py b/settings.py index 49c59e2..61d0bfc 100644 --- a/settings.py +++ b/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 = ( diff --git a/templates/svxfile.html b/templates/svxfile.html index d9f1e86..72e4446 100644 --- a/templates/svxfile.html +++ b/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 %} |