diff options
Diffstat (limited to 'archaeological_finds/views.py')
| -rw-r--r-- | archaeological_finds/views.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 2e84757c9..828f9801d 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -84,9 +84,9 @@ def autocomplete_treatmentfile(request): models.Treatment) \ and not request.user.ishtaruser.has_right('treatmentfile_search', session=request.session): - return HttpResponse(mimetype='text/plain') + return HttpResponse(content_type='text/plain') if not request.GET.get('term'): - return HttpResponse(mimetype='text/plain') + return HttpResponse(content_type='text/plain') q = request.GET.get('term') query = Q() for q1 in q.split(' '): @@ -104,7 +104,7 @@ def autocomplete_treatmentfile(request): files = models.TreatmentFile.objects.filter(query)[:limit] data = json.dumps([{'id': file.pk, 'value': unicode(file)} for file in files]) - return HttpResponse(data, mimetype='text/plain') + return HttpResponse(data, content_type='text/plain') show_findsource = show_item(models.FindSource, 'findsource') @@ -170,8 +170,11 @@ find_modification_wizard = FindModificationWizard.as_view([ def find_modify(request, pk): find_modification_wizard(request) + key = 'selec-find_modification' + if get_current_profile().warehouse: + key = 'selecw-find_modification' FindModificationWizard.session_set_value( - request, 'selec-find_modification', 'pk', pk, reset=True) + request, key, 'pk', pk, reset=True) return redirect( reverse('find_modification', kwargs={'step': 'selecrecord-find_modification'})) |