ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:snipe/snipe-it into develop

Browse Source
This commit is contained in:
snipe
2016-01-05 13:12:57 -08:00
parent 602501b4a3 e392c87250
commit d4685ec037
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/Company.php
+9 -8
View File
@@ -95,7 +95,7 @@ final class Company extends Elegant
public static function scopeCompanyableChildren(array $companyable_names, $query)
{
if (count($companyable_names) == 0) { throw new Exception('-_-'); }
if (count($companyable_names) == 0) { throw new Exception('No Companyable Children to scope'); }
else if (!static::isFullMultipleCompanySupportEnabled()) { return $query; }
else
{
@@ -103,14 +103,15 @@ final class Company extends Elegant
{
static::scopeCompanyablesDirectly($q);
};
$q = $query->where(function ($q) {
$q2 = $q->whereHas($companyable_names[0], $f);
$q = $query->whereHas($companyable_names[0], $f);
for ($i = 1; $i < count($companyable_names); $i++)
{
$q = $q->orWhereHas($companyable_names[$i], $f);
}
for ($i = 1; $i < count($companyable_names); $i++)
{
$q2 = $q2->orWhereHas($companyable_names[$i], $f);
}
});
return $q;
}
}