From 9f6e60eb9125e3becc471377f289d2c815257166 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sat, 14 Sep 2019 18:29:47 +0200 Subject: Fix file imports - fix tests with redirs --- archaeological_files/views.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'archaeological_files') 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 -- cgit v1.2.3