Bug fixes

2020-01-06 20:01:04 +11:00
parent 948e8ce9fc
commit 7bd4bad941
8 changed files with 26 additions and 19 deletions
--- a/app/Models/Abstracted/Catalog.php
+++ b/app/Models/Abstracted/Catalog.php
@@ -132,7 +132,11 @@ abstract class Catalog extends Model
 		return $query->where(function($query)
 		{
 			$query->where('duplicate','<>',TRUE)
-				->orWhere('duplicate','=',NULL);
+				->orWhere('duplicate','=',NULL)
+				->orWhere(function($q) {
+					$q->where('duplicate','=',TRUE)
+						->where('ignore_duplicate','=',TRUE);
+				});
 		});
 	}

@@ -490,7 +494,7 @@ abstract class Catalog extends Model

 	public function setDateCreated()
 	{
-		$this->created = $this->property('creationdate');
+		$this->created = $this->property('creationdate') ?: NULL;
 	}

 	public function setHeightWidth()