diff options
Diffstat (limited to 'archaeological_files/views.py')
| -rw-r--r-- | archaeological_files/views.py | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/archaeological_files/views.py b/archaeological_files/views.py index c7a8830c8..e038c515f 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -29,17 +29,17 @@ from django.utils.translation import ugettext_lazy as _ from ishtar_common.views_item import get_item, show_item, revert_item from archaeological_operations.models import Operation -import models +from . import models from ishtar_common.wizards import SearchWizard from archaeological_operations.wizards import AdministrativeActDeletionWizard, \ is_preventive, is_not_preventive -from wizards import * +from .wizards import * from ishtar_common.forms_common import TownFormset from archaeological_operations.forms import FinalAdministrativeActDeleteForm from ishtar_common.forms import ClosingDateFormSelection -from forms import * +from . import forms RE_YEAR_INDEX = re.compile(r"([1-2][0-9]{3})-([0-9]+)") # eg.: 2014-123 @@ -71,13 +71,13 @@ def autocomplete_file(request): query = query & extra limit = 20 files = models.File.objects.filter(query)[:limit] - data = json.dumps([{'id': file.pk, 'value': unicode(file)} + data = json.dumps([{'id': file.pk, 'value': str(file)} for file in files]) return HttpResponse(data, content_type='text/plain') get_file = get_item(models.File, 'get_file', 'file', - search_form=FileSelect) + search_form=forms.FileSelect) revert_file = revert_item(models.File) @@ -103,16 +103,16 @@ def dashboard_file(request, *args, **kwargs): return render(request, 'ishtar/dashboards/dashboard_file.html', dct) file_search_wizard = FileSearch.as_view( - [('general-file_search', FileFormSelection)], + [('general-file_search', forms.FileFormSelection)], label=_(u"File search"), url_name='file_search',) file_creation_wizard = FileWizard.as_view( - [('general-file_creation', FileFormGeneral), + [('general-file_creation', forms.FileFormGeneral), ('towns-file_creation', TownFormset), - ('parcels-file_creation', ParcelFormset), - ('preventive-file_creation', FileFormPreventive), - ('research-file_creation', FileFormResearch), - ('final-file_creation', FinalForm)], + ('parcels-file_creation', forms.ParcelFormset), + ('preventive-file_creation', forms.FileFormPreventive), + ('research-file_creation', forms.FileFormResearch), + ('final-file_creation', forms.FinalForm)], label=_(u"New file"), condition_dict={ 'preventive-file_creation': @@ -125,13 +125,13 @@ file_creation_wizard = FileWizard.as_view( url_name='file_creation',) file_modification_wizard = FileModificationWizard.as_view( - [('selec-file_modification', FileFormSelection), - ('general-file_modification', FileFormGeneralRO), + [('selec-file_modification', forms.FileFormSelection), + ('general-file_modification', forms.FileFormGeneralRO), ('towns-file_modification', TownFormset), - ('parcels-file_modification', ParcelFormset), - ('preventive-file_modification', FileFormPreventive), - ('research-file_modification', FileFormResearch), - ('final-file_modification', FinalForm)], + ('parcels-file_modification', forms.ParcelFormset), + ('preventive-file_modification', forms.FileFormPreventive), + ('research-file_modification', forms.FileFormResearch), + ('final-file_modification', forms.FinalForm)], label=_(u"File modification"), condition_dict={ 'preventive-file_modification': @@ -152,40 +152,40 @@ def file_modify(request, pk): kwargs={'step': 'general-file_modification'})) file_closing_wizard = FileClosingWizard.as_view( - [('selec-file_closing', FileFormSelection), + [('selec-file_closing', forms.FileFormSelection), ('date-file_closing', ClosingDateFormSelection), - ('final-file_closing', FinalFileClosingForm)], + ('final-file_closing', forms.FinalFileClosingForm)], label=_(u"File closing"), url_name='file_closing',) file_deletion_wizard = FileDeletionWizard.as_view( - [('selec-file_deletion', FileFormSelection), - ('final-file_deletion', FinalFileDeleteForm)], + [('selec-file_deletion', forms.FileFormSelection), + ('final-file_deletion', forms.FinalFileDeleteForm)], label=_(u"File deletion"), url_name='file_deletion',) file_administrativeactfile_search_wizard = \ SearchWizard.as_view([ ('selec-file_administrativeactfile_search', - AdministrativeActFileFormSelection)], + forms.AdministrativeActFileFormSelection)], label=_(u"File: search administrative act"), url_name='file_administrativeactfile_search',) file_administrativeactfile_wizard = \ FileAdministrativeActWizard.as_view([ - ('selec-file_administrativeactfile', FileFormSelection), + ('selec-file_administrativeactfile', forms.FileFormSelection), ('administrativeact-file_administrativeactfile', - AdministrativeActFileForm), - ('final-file_administrativeactfile', FinalForm)], + forms.AdministrativeActFileForm), + ('final-file_administrativeactfile', forms.FinalForm)], label=_(u"File: new administrative act"), url_name='file_administrativeactfile',) file_administrativeactfile_modification_wizard = \ FileEditAdministrativeActWizard.as_view([ ('selec-file_administrativeactfile_modification', - AdministrativeActFileModifyFormSelection), + forms.AdministrativeActFileModifyFormSelection), ('administrativeact-file_administrativeactfile_modification', - AdministrativeActFileModifForm), - ('final-file_administrativeactfile_modification', FinalForm)], + forms.AdministrativeActFileModifForm), + ('final-file_administrativeactfile_modification', forms.FinalForm)], label=_(u"File: administrative act modification"), url_name='file_administrativeactfile_modification',) @@ -207,7 +207,7 @@ def file_administrativeactfile_modify(request, pk): file_administrativeactfile_deletion_wizard = \ AdministrativeActDeletionWizard.as_view([ ('selec-file_administrativeactfile_deletion', - AdministrativeActFileFormSelection), + forms.AdministrativeActFileFormSelection), ('final-file_administrativeactfile_deletion', FinalAdministrativeActDeleteForm)], label=_(u"File: administrative act deletion"), |