AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Gravatar integration

Browse Source
This commit is contained in:
Frederic Guillot
2015-03-30 21:27:49 -04:00
parent b17f4b28ca
commit 01f9ee3410
23 changed files with 85 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Model/Comment.php
View File

@@ -47,7 +47,8 @@ class Comment extends Base
self::TABLE.'.user_id',
self::TABLE.'.comment',
User::TABLE.'.username',
User::TABLE.'.name'
User::TABLE.'.name',
User::TABLE.'.email'
)
->join(User::TABLE, 'id', 'user_id')
->orderBy(self::TABLE.'.date', 'ASC')

7
app/Model/ProjectActivity.php
View File

@@ -85,18 +85,19 @@ class ProjectActivity extends Base
->columns(
self::TABLE.'.*',
User::TABLE.'.username AS author_username',
User::TABLE.'.name AS author_name'
User::TABLE.'.name AS author_name',
User::TABLE.'.email'
)
->in('project_id', $project_ids)
->join(User::TABLE, 'id', 'creator_id')
->desc(self::TABLE.'.id')
->limit($limit);
if(!is_null($start)){
if (!is_null($start)){
$query->gte('date_creation', $start);
}
if(!is_null($end)){
if (!is_null($end)){
$query->lte('date_creation', $end);
}