Merge pull request #322 from openclassify/vedat

add with trashed parameter
This commit is contained in:
Fatih Alp 2020-02-14 12:36:16 +03:00 committed by GitHub
commit 1d8b08a5f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2930 additions and 1502 deletions

View File

@ -59,18 +59,26 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
return 1;
}
public function getAdv($id = null, $nullable_ad = false)
public function getAdv($id = null, $nullable_ad = false, $trashed = false)
{
if ($id != null) {
if ($nullable_ad)
return $this->find($id);
else
return $this->where('advs_advs.slug', '!=', "")
->find($id);
$query = $this::query();
if ($trashed) {
$query = $this::withTrashed();
}
if ($nullable_ad)
return $this->newQuery();
return $this->where('advs_advs.slug', '!=', "");
if ($id != null) {
if ($nullable_ad) {
return $query->find($id);
} else {
return $query->where('advs_advs.slug', '!=', "")
->find($id);
}
}
if ($nullable_ad) {
return $query->newQuery();
}
return $query->where('advs_advs.slug', '!=', "");
}
public function userAdv($nullable_ad = false)

File diff suppressed because it is too large Load Diff