Permalink
Browse files

Fix SQL typo

Fixing typo in user table (from heatbeat to heartbeat). Also adding
support for Project Creators to see the chat room for a project.
  • Loading branch information...
1 parent 5dc8019 commit 67be2e0210e387aa2da83396efc960b5ea584b67 @jgonzales8 jgonzales8 committed May 6, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 database.sql
  2. +1 −1 views/site/partial/page.tpl.php
View
@@ -494,7 +494,7 @@ CREATE TABLE IF NOT EXISTS `user` (
`date_created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`last_login` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
`second_last_login` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
- `last_heatbeat` timestamp DEFAULT '0000-00-00 00:00:00',
+ `last_heartbeat` timestamp DEFAULT '0000-00-00 00:00:00',
`latest_chatroom` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=50 ;
@@ -36,7 +36,7 @@
//Chat is only supported at the chat room level for now
if (!empty($projectId)){
//Check whether chat is enabled in config.php and user is part of the project or an admin user
- If ((ENABLE_CHAT==1) && ($project->isMember(Session::getUserID()) || Session::isAdmin())) {
+ If ((ENABLE_CHAT==1) && ($project->isMember(Session::getUserID()) || Session::isAdmin() || $project->isCreator(Session::getUserID()))) {
$showChatBox = true;
}
}

0 comments on commit 67be2e0

Please sign in to comment.