Fix tag default fix, fatal error

load_search.php

@@ -77,10 +77,14 @@ $columns = $result['columns'];
 $column_model = $result['column_model'];
 $defaults = [];
 
+$tagsData = [];
 if (!empty($items)) {
     /** @var ExtraFieldSavedSearch $item */
     foreach ($items as $item) {
         $variable = 'extra_'.$item->getField()->getVariable();
+        if ($item->getField()->getFieldType() == Extrafield::FIELD_TYPE_TAG) {
+            $tagsData[$variable] = $item->getValue();
+        }
         $defaults[$variable] = $item->getValue();
     }
 }
@@ -103,7 +107,6 @@ if ($form->validate()) {
             $filters[$key] = $value;
         }
     }
-
     $filterToSend = [];
     if (!empty($filters)) {
         $filterToSend = ['groupOp' => 'AND'];
@@ -124,11 +127,24 @@ if ($form->validate()) {
     }
 }
 
+$jsTag = '';
+if (!empty($tagsData)) {
+    foreach ($tagsData as $extraField => $tags) {
+        foreach ($tags as $tag) {
+            $jsTag .= "$('#$extraField')[0].addItem('$tag', '$tag');";
+        }
+    }
+}
+
+
 $htmlHeadXtra[] ='
 <script>
 
 $(function() {
     '.$extra['jquery_ready_content'].'
+
+        '.$jsTag.'
+
 });
 </script>';
 

main/inc/lib/extra_field.lib.php

@@ -384,7 +384,7 @@ class ExtraField extends Model
      *
      * @return array|bool
      */
-    public function addElements($form, $itemId = 0, $exclude = [], $filter = false)
+    public function addElements($form, $itemId = 0, $exclude = [], $filter = false, $useTagAsSelect = false)
     {
         if (empty($form)) {
             return false;
@@ -696,6 +696,14 @@ class ExtraField extends Model
      */
     public function delete($id)
     {
+        $em = Database::getManager();
+        $items = $em->getRepository('ChamiloCoreBundle:ExtraFieldSavedSearch')->findBy(['field' => $id]);
+        if ($items) {
+            foreach ($items as $item) {
+                $em->remove($item);
+            }
+            $em->flush();
+        }
         $field_option = new ExtraFieldOption($this->type);
         $field_option->delete_all_options_by_field_id($id);
 

search.php

@@ -25,7 +25,7 @@ $items = $em->getRepository('ChamiloCoreBundle:ExtraFieldSavedSearch')->findBy($
 
 $extraField = new ExtraField('session');
 $extraFieldValue = new ExtraFieldValue('session');
-$extra = $extraField->addElements($form, '', [], true);
+$extra = $extraField->addElements($form, '', [], true, true);
 
 $form->addButtonSave(get_lang('Save'), 'save');
 //$form->addButtonSearch(get_lang('Search'), 'search');