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

Add support for nickname (#1359)

Browse Source
This commit is contained in:
Régis Freyd
2018-06-04 18:02:21 -04:00
committed by GitHub
parent 98761a7a53
commit 3d1ff3e867
55 changed files with 489 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/DashboardController.php
+2 -2
View File
@@ -39,7 +39,7 @@ class DashboardController extends Controller
'avatar_url' => $contact->getAvatarURL(110),
'initials' => $contact->getInitials(),
'default_avatar_color' => $contact->default_avatar_color,
'complete_name' => $contact->getCompleteName(auth()->user()->name_order),
'complete_name' => $contact->name,
];
$lastUpdatedContactsCollection->push(json_encode($data));
}
@@ -116,7 +116,7 @@ class DashboardController extends Controller
'avatar_url' => $note->contact->getAvatarURL(110),
'initials' => $note->contact->getInitials(),
'default_avatar_color' => $note->contact->default_avatar_color,
'complete_name' => $note->contact->getCompleteName(auth()->user()->name_order),
'complete_name' => $note->contact->name,
],
];
$notesCollection->push($data);