4 files changed, 28 insertions, 1 deletions
diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py
index ab9bdea98..03531d54c 100644
--- a/archaeological_operations/admin.py
+++ b/archaeological_operations/admin.py
@@ -63,7 +63,7 @@ admin.site.register(models.Operation, OperationAdmin)
 class OperationSourceAdmin(admin.ModelAdmin):
     list_display = ('operation', 'title', 'source_type',)
     list_filter = ('source_type',)
-    search_fields = ('title', 'operation__name')
+    search_fields = ('title', 'operation__common_name')
     model = models.OperationSource
 
 admin.site.register(models.OperationSource, OperationSourceAdmin)
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 11055ccfb..4473d7858 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -228,6 +228,13 @@ class OperationSelect(TableSelect):
                                 widget=widgets.JQueryDate)
     parcel = ParcelField(label=_("Parcel (section/number)"))
     end_date = forms.NullBooleanField(label=_(u"Is open?"))
+    history_creator = forms.IntegerField(
+            label=_(u"Created by"),
+            widget=widgets.JQueryAutoComplete(
+                reverse_lazy('autocomplete-person',
+                args=['0', 'user']),
+                associated_model=Person),
+            validators=[valid_id(Person)])
 
     def __init__(self, *args, **kwargs):
         super(OperationSelect, self).__init__(*args, **kwargs)
@@ -648,6 +655,13 @@ class AdministrativeActOpeSelect(TableSelect):
                                   max_length=15)
     act_type = forms.ChoiceField(label=_("Act type"), choices=[])
     operation__towns = get_town_field()
+    history_creator = forms.IntegerField(
+            label=_(u"Created by"),
+            widget=widgets.JQueryAutoComplete(
+                reverse_lazy('autocomplete-person',
+                args=['0', 'user']),
+                associated_model=Person),
+            validators=[valid_id(Person)])
 
     def __init__(self, *args, **kwargs):
         super(AdministrativeActOpeSelect, self).__init__(*args, **kwargs)
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',]