summaryrefslogtreecommitdiff
path: root/archaeological_files/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-09-14 18:29:47 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-09-14 18:29:47 +0200
commit9f6e60eb9125e3becc471377f289d2c815257166 (patch)
tree0aa879bf17c6dfab7879c85f76f15a69d2a843a8 /archaeological_files/views.py
parente0ed1f16e23b95752cefd53011264801b7e96112 (diff)
downloadIshtar-9f6e60eb9125e3becc471377f289d2c815257166.tar.bz2
Ishtar-9f6e60eb9125e3becc471377f289d2c815257166.zip
Fix file imports - fix tests with redirs
Diffstat (limited to 'archaeological_files/views.py')
-rw-r--r--archaeological_files/views.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index a23475c3e..f55dbe73c 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -23,7 +23,7 @@ import re
from django.core.urlresolvers import reverse
from django.db.models import Q
from django.http import HttpResponse, Http404, HttpResponseRedirect
-from django.shortcuts import redirect
+from django.shortcuts import redirect, render
from django.utils.translation import ugettext_lazy as _
from ishtar_common.views import wizard_is_available
@@ -31,14 +31,18 @@ from ishtar_common.views_item import get_item, show_item, revert_item
from archaeological_operations.wizards import AdministrativeActDeletionWizard, \
is_preventive, is_not_preventive
-from .wizards import *
+
+from ishtar_common.wizards import SearchWizard
+from archaeological_files.wizards import FileSearch, FileWizard, \
+ FileModificationWizard, FileClosingWizard, FileDeletionWizard, \
+ FileAdministrativeActWizard, FileEditAdministrativeActWizard
from ishtar_common.forms_common import TownFormset
from archaeological_operations.forms import FinalAdministrativeActDeleteForm
from ishtar_common.forms import ClosingDateFormSelection
-from . import forms
+from . import forms, models
-from ishtar_common.utils import put_session_message
+from archaeological_operations.models import Operation, AdministrativeAct
RE_YEAR_INDEX = re.compile(r"([1-2][0-9]{3})-([0-9]+)") # eg.: 2014-123