diff options
Diffstat (limited to 'archaeological_files_pdl')
-rw-r--r-- | archaeological_files_pdl/forms.py | 8 | ||||
-rw-r--r-- | archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html | 8 | ||||
-rw-r--r-- | archaeological_files_pdl/tests.py | 16 |
3 files changed, 9 insertions, 23 deletions
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index 805acfc09..a182d0f0e 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -24,7 +24,7 @@ from django.core import validators from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ -from ishtar_common.models import Person, PersonType, Town, Department, valid_id +from ishtar_common.models import Person, Town, Department, valid_id from archaeological_files import models from ishtar_common.forms import get_now, reverse_lazy @@ -32,6 +32,8 @@ from archaeological_files.forms import GENERAL_CONTRACTOR, \ GENERAL_CONTRACTOR_ORGA, RESPONSIBLE_PLANNING_SERVICE, \ RESPONSIBLE_PLANNING_SERVICE_ORGA +from archaeological_operations.forms import SRA_AGENT + from ishtar_common import widgets @@ -380,10 +382,10 @@ class FileFormInstruction(forms.Form): widget=widgets.JQueryAutoComplete( reverse_lazy( 'autocomplete-person', - args=[PersonType.objects.get(txt_idx='sra_agent').pk]), + args=[SRA_AGENT.pk]), limit={ 'person_types': [ - PersonType.objects.get(txt_idx='sra_agent').pk] + SRA_AGENT.pk] }, associated_model=Person, new=True), validators=[valid_id(Person)]) diff --git a/archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html b/archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html index fd85de473..f5268f582 100644 --- a/archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html +++ b/archaeological_files_pdl/templates/ishtar/wizard/file_confirm_wizard.html @@ -5,10 +5,10 @@ {% block "warning_informations" %} {% for file in numeric_reference_files %} {% if forloop.first %} -<p class='alert'><label>{% trans "The following files have the same numeric index as this file:" %}</label></p> +<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <label>{% trans "The following files have the same numeric index as this file:" %}</label></p> <ul> {% endif%} - <li>{{file}} <a href='#' onclick='load_window("{% url 'show-file' file.pk '' %}", "{{model_name}}");' class='display_details'>{% trans "Details" %}</a></li> + <li>{{file}} <a href='#' onclick='load_window("{% url 'show-file' file.pk '' %}", "{{model_name}}");' class='display_details'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li> {% if forloop.last %} </ul> <hr/> @@ -16,10 +16,10 @@ {% endfor %} {% for file in similar_files %} {% if forloop.first %} -<p class='alert'><label>{% trans "The following files are in the same town and have parcels in common with this file:" %}</label></p> +<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <label>{% trans "The following files are in the same town and have parcels in common with this file:" %}</label></p> <ul> {% endif%} - <li>{{file}} <a href='#' onclick='load_window("{% url 'show-file' file.pk '' %}", "{{model_name}}");' class='display_details'>{% trans "Details" %}</a></li> + <li>{{file}} <a href='#' onclick='load_window("{% url 'show-file' file.pk '' %}", "{{model_name}}");' class='display_details'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li> {% if forloop.last %} </ul> <hr/> diff --git a/archaeological_files_pdl/tests.py b/archaeological_files_pdl/tests.py deleted file mode 100644 index 501deb776..000000000 --- a/archaeological_files_pdl/tests.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -This file demonstrates writing tests using the unittest module. These will pass -when you run "manage.py test". - -Replace this with more appropriate tests for your application. -""" - -from django.test import TestCase - - -class SimpleTest(TestCase): - def test_basic_addition(self): - """ - Tests that 1 + 1 always equals 2. - """ - self.assertEqual(1 + 1, 2) |