diff options
| -rw-r--r-- | archaeological_operations/templates/ishtar/wizard/wizard_adminact_deletion.html | 8 | ||||
| -rw-r--r-- | archaeological_operations/wizards.py | 5 | ||||
| -rw-r--r-- | ishtar_common/static/media/style.css | 8 | ||||
| -rw-r--r-- | ishtar_common/views.py | 1 |
4 files changed, 19 insertions, 3 deletions
diff --git a/archaeological_operations/templates/ishtar/wizard/wizard_adminact_deletion.html b/archaeological_operations/templates/ishtar/wizard/wizard_adminact_deletion.html new file mode 100644 index 000000000..0b44b4ad0 --- /dev/null +++ b/archaeological_operations/templates/ishtar/wizard/wizard_adminact_deletion.html @@ -0,0 +1,8 @@ +{% extends "ishtar/wizard/confirm_wizard.html" %} +{% load i18n %} + +{% block "extra_informations" %} +{% if current_object.index %} +<p class='alert'><label>{%trans "This act is indexed!"%}</label></p> +{% endif %} +{% endblock %} diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py index 6d117ae43..70583068b 100644 --- a/archaeological_operations/wizards.py +++ b/archaeological_operations/wizards.py @@ -350,6 +350,11 @@ class OperationEditAdministrativeActWizard(OperationAdministrativeActWizard): return self.get_current_object().operation class AdministrativeActDeletionWizard(ClosingWizard): + wizard_templates = { + 'final-operation_administrativeactop_deletion':\ + 'ishtar/wizard/wizard_adminact_deletion.html', + 'final-file_administrativeactfile_deletion':\ + 'ishtar/wizard/wizard_adminact_deletion.html'} model = models.AdministrativeAct fields = ['act_type', 'in_charge', 'operator', 'scientist', 'signatory', 'operation', 'associated_file', 'signature_date', 'act_object',] diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 60687e5dd..4f7feddd7 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -633,14 +633,14 @@ table.confirm tr.spacer td:last-child{ margin:0.3em; } -#window p.alert{ +p.alert{ color:#D14; display:block; font-style:italic; width:670px; padding:1em; padding-left:2em; - background-color:#EEE; + background-color:#FFF; -moz-border-radius:8px; -webkit-border-radius:8px; border-radius:8px; @@ -649,6 +649,10 @@ table.confirm tr.spacer td:last-child{ background-position:left center; } +#window p.alert{ + background-color:#EEE; +} + #window p.alert label{ width:650px; } diff --git a/ishtar_common/views.py b/ishtar_common/views.py index e9c2a0c1c..8fbf41759 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -162,7 +162,6 @@ def autocomplete_person(request, person_types=None, is_ishtar_user=None): query = query & Q(ishtaruser__isnull=False) limit = 20 persons = models.Person.objects.filter(query)[:limit] - print persons.query data = json.dumps([{'id':person.pk, 'value':unicode(person)} for person in persons if person]) return HttpResponse(data, mimetype='text/plain') |