amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix: fix tags getting error (#2205)

Browse Source
This commit is contained in:
Alexis Saettler
2018-12-25 22:22:23 +01:00
committed by GitHub
parent 9c3f80a829
commit 8ce964a6f3
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ContactsController.php
+15 -14
View File
@@ -58,10 +58,6 @@ class ContactsController extends Controller
$user->updateContactViewPreference($sort);
}
$tags = null;
$url = '';
$count = 1;
$contacts = $user->account->contacts()->real();
if ($active) {
$nbArchived = $contacts->count();
@@ -72,28 +68,33 @@ class ContactsController extends Controller
$nbArchived = $contacts->count();
}
$tags = null;
$url = '';
$count = 1;
if ($request->get('no_tag')) {
//get tag less contacts
// get tag less contacts
$contacts = $contacts->tags('NONE');
} elseif ($request->get('tag1')) {
// get contacts with selected tags
// get contacts with selected tags
$tags = collect();
while ($request->get('tag'.$count)) {
$tag = Tag::where('account_id', auth()->user()->account_id)
->where('name_slug', $request->get('tag'.$count))
->get();
->where('name_slug', $request->get('tag'.$count));
if ($tag->count() > 0) {
$tag = $tag->get();
if (! ($tags->contains($tag[0]))) {
$tags = $tags->concat($tag);
if (! $tags->contains($tag[0])) {
$tags = $tags->concat($tag);
}
$url .= 'tag'.$count.'='.$tag[0]->name_slug.'&';
}
$url = $url.'tag'.$count.'='.$tag[0]->name_slug.'&';
$count++;
}
if (is_null($tags)) {
if ($tags->count() == 0) {
return redirect()->route('people.index');
}