New management of modules

1 files changed, 22 insertions, 25 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index d18e7cea7..37ccbf277 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -34,14 +34,11 @@ from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 from django.utils.safestring import mark_safe
 
 from ishtar_common.models import valid_id, PersonType, Person, Town, \
-    DocumentTemplate, Organization, OrganizationType
+    DocumentTemplate, Organization, OrganizationType, get_current_profile
 
 from ishtar_common.wizards import MultiValueDict
 
-FILES_AVAILABLE = 'archaeological_files' in settings.INSTALLED_APPS
-
-if FILES_AVAILABLE:
-    from archaeological_files.models import File
+from archaeological_files.models import File
 import models
 
 from widgets import ParcelWidget, SelectParcelWidget
@@ -566,16 +563,16 @@ class OperationCodeInput(forms.TextInput):
             'url': reverse_lazy('get_available_operation_code')}
         return mark_safe(rendered + js)
 
-if FILES_AVAILABLE:
-    class OperationFormFileChoice(forms.Form):
-        form_label = _(u"Associated file")
-        associated_models = {'associated_file': File, }
-        currents = {'associated_file': File}
-        associated_file = forms.IntegerField(
-            label=_(u"Archaelogical file"),
-            widget=widgets.JQueryAutoComplete(
-                reverse_lazy('autocomplete-file'), associated_model=File),
-            validators=[valid_id(File)], required=False)
+
+class OperationFormFileChoice(forms.Form):
+    form_label = _(u"Associated file")
+    associated_models = {'associated_file': File, }
+    currents = {'associated_file': File}
+    associated_file = forms.IntegerField(
+        label=_(u"Archaelogical file"),
+        widget=widgets.JQueryAutoComplete(
+            reverse_lazy('autocomplete-file'), associated_model=File),
+        validators=[valid_id(File)], required=False)
 
 
 class OperationFormAbstract(forms.Form):
@@ -814,14 +811,13 @@ class OperationFormGeneral(forms.Form):
 class OperationFormModifGeneral(OperationFormGeneral):
     operation_code = forms.IntegerField(label=_(u"Operation code"),
                                         required=False)
-    if FILES_AVAILABLE:
-        currents = {'associated_file': File}
-        associated_file = forms.IntegerField(
-            label=_(u"Archaelogical file"),
-            widget=widgets.JQueryAutoComplete(
-                reverse_lazy('autocomplete-file'),
-                associated_model=File),
-            validators=[valid_id(File)], required=False)
+    currents = {'associated_file': File}
+    associated_file = forms.IntegerField(
+        label=_(u"Archaelogical file"),
+        widget=widgets.JQueryAutoComplete(
+            reverse_lazy('autocomplete-file'),
+            associated_model=File),
+        validators=[valid_id(File)], required=False)
 
     def __init__(self, *args, **kwargs):
         super(OperationFormModifGeneral, self).__init__(*args, **kwargs)
@@ -829,12 +825,13 @@ class OperationFormModifGeneral(OperationFormGeneral):
         self.fields.keyOrder.pop(self.fields.keyOrder.index('associated_file'))
         self.fields.keyOrder.insert(self.fields.keyOrder.index('in_charge'),
                                     'associated_file')
+        if not get_current_profile().files:
+            self.fields.pop('associated_file')
 
 OperationFormModifGeneral.associated_models = \
     OperationFormGeneral.associated_models.copy()
 
-if FILES_AVAILABLE:
-    OperationFormModifGeneral.associated_models['associated_file'] = File
+OperationFormModifGeneral.associated_models['associated_file'] = File
 
 
 class OperationFormPreventive(forms.Form):