fix

alchemy-fr · Dec 20, 2023 · c9fef92 · c9fef92
1 parent 7d72143
commit c9fef92
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/Alchemy/Phrasea/Command/Record/BuildSubdefs.php b/lib/Alchemy/Phrasea/Command/Record/BuildSubdefs.php
@@ -401,7 +401,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output)
 
                 /** @var media_subdef $subdef */
                 $subdefsDeleted = [];
-                foreach ($record->get_subdefs() as $subdef) {
+                foreach ($record->get_subdefs_from_db() as $subdef) {
                     $name = $subdef->get_name();
                     if($name == "document") {
                         continue;
@@ -597,7 +597,7 @@ protected function getSQL()
         $sql .= "GROUP BY r.`record_id`";
 
         if(!$this->scheduled && !$this->all) {
-            $sql .= "\nHAVING `exists` != `waited`";
+            $sql .= "\nHAVING (`exists` IS NULL OR `exists` != `waited`)";
         }
 
         $sql .= "\nORDER BY r.`record_id` " . ($this->reverse ? "DESC" : "ASC");

diff --git a/lib/classes/record/adapter.php b/lib/classes/record/adapter.php
@@ -745,6 +745,19 @@ public function get_subdefs()
         return $this->subdefs;
     }
 
+    /**
+     * @return media_subdef[]
+     */
+    public function get_subdefs_from_db()
+    {
+        $subdefs = [];
+        foreach ($this->getMediaSubdefRepository()->findByRecordIdsAndNames([$this->getRecordId()]) as $subdef) {
+            $subdefs[$subdef->get_name()] = $subdef;
+        }
+
+        return $subdefs;
+    }
+
     /**
      * @return string[]
      */