Merge branch 'main' of https://github.com/NFDI4Chem/nmrxiv into prod-…

…helm-deploy
NFDI4Chem · Feb 9, 2024 · f565299 · f565299
2 parents 063af92 + 8c8a8fc
commit f565299
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.0.3](https://github.com/NFDI4Chem/nmrxiv/compare/v1.0.2...v1.0.3) (2024-02-09)
+
+
+### Bug Fixes
+
+* handle null study download url ([7352381](https://github.com/NFDI4Chem/nmrxiv/commit/7352381c5285bdaa3f4a49059acc03bafd704de0))
+* hide organism if null ([5c7abb5](https://github.com/NFDI4Chem/nmrxiv/commit/5c7abb550f92759d5b3d8eb4b1367bd13cae7b55))
+
 ## [1.0.2](https://github.com/NFDI4Chem/nmrxiv/compare/v1.0.1...v1.0.2) (2024-02-06)
 
 

diff --git a/app/Models/FileSystemObject.php b/app/Models/FileSystemObject.php
@@ -59,7 +59,7 @@ class FileSystemObject extends Model
     public function getDownloadUrlAttribute()
     {
         if ($this->model_type == 'study') {
-            return $this->study->download_url;
+            return $this->study ? $this->study->download_url : null;
         }
     }
 

diff --git a/resources/js/Pages/Public/Project/Show.vue b/resources/js/Pages/Public/Project/Show.vue
@@ -32,7 +32,7 @@
                         </div>
                     </div>
 
-                    <div v-if="project.data.species" class="pt-2">
+                    <div v-if="project.data.species && project.data.species.length > 0" class="pt-2">
                         <h3 class="text-xl font-extrabold text-blue-gray-900">
                             Organism
                         </h3>