fix(supann-ext) Various fixes to supann extension

issue #5831

supann-ext/admin/supannStructures/class_supannStructureExt.inc

@@ -44,13 +44,13 @@ class supannStructureExt extends simplePlugin
         'name'  => _('Validity'),
         'attrs' => array(
           new GeneralizedTimeDateAttribute(
-            _('Start'), _('The date from which this structure will be valid'),
-            'fdSupannStartDate', TRUE,
+            _('Start date'), _('The date from which this structure will be valid'),
+            'fdSupannStartDate', FALSE,
             ''
           ),
           new GeneralizedTimeDateAttribute(
-            _('End'), _('The date after which this structure will not be valid anymore'),
-            'fdSupannEndDate', TRUE,
+            _('End date'), _('The date after which this structure will not be valid anymore'),
+            'fdSupannEndDate', FALSE,
             ''
           ),
         )
@@ -120,10 +120,15 @@ class supannStructureExt extends simplePlugin
       }
     }
     array_multisort($label_entites,         $code_entites);
-    array_multisort($label_etablissements,  $code_etablissements);
 
     $this->attributesAccess['fdSupannRelationEntite']->attribute->attributes[2]->setChoices($code_entites, $label_entites);
   }
+
+  protected function prepare_save ()
+  {
+    $this->attributesAccess['fdSupannRelationEntite']->supannPrepareSave();
+    return parent::prepare_save();
+  }
 }
 
 ?>

supann-ext/contrib/openldap/supann-ext-fd.schema

@@ -42,7 +42,7 @@ attributetype ( 1.3.6.1.4.1.38414.66.1.6 NAME 'fdSupannRelationEntite'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} )
 
 # Object Class
-objectclass (1.3.6.1.4.1.38414.66.2.1 NAME 'fdSupannExt'
+objectclass (1.3.6.1.4.1.38414.66.2.1 NAME 'fdSupannExt' SUP top AUXILIARY
   DESC 'FusionDirectory - audit event'
   MUST ( )
   MAY  (