karsten/scattport-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add icons to project sidebar

Browse Source
This commit is contained in:
Eike Foken
2011-09-08 22:21:51 +02:00
parent 33b8c51038
commit afe3e5d00e
3 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
application/models/project.php
View File

@@ -58,9 +58,13 @@ class Project extends CI_Model {
* @return array The user's projects.
*/
public function getOwn() {
$query = $this->db->where(array('owner' => $this->session->userdata('user_id')))
->order_by('lastaccess', 'desc')
->get('projects');
$this->db->select('projects.*, COUNT(shares.user_id) AS shares');
$this->db->join('shares', 'shares.project_id = projects.id', 'left');
$this->db->group_by('shares.project_id');
$this->db->where(array('owner' => $this->session->userdata('user_id')));
$query = $this->db->order_by('last_access DESC')->get('projects');
return $this->_addShortNames($query->result_array());
}
@@ -71,7 +75,7 @@ class Project extends CI_Model {
*/
public function getShared() {
$this->load->library('session');
$this->db->select('*')->from('shares')->order_by('lastaccess', 'desc')->where(array('user_id' => $this->session->userdata('user_id')));
$this->db->select('*')->from('shares')->order_by('last_access DESC')->where(array('user_id' => $this->session->userdata('user_id')));
$this->db->join('projects', 'projects.id = shares.project_id');
$query = $this->db->get();
@@ -118,7 +122,7 @@ class Project extends CI_Model {
*/
public function getById($projectId) {
$result = $this->db->get_where('projects', array('id' => $projectId))->row_array();
$this->db->where('id', $projectId)->update('projects', array('lastaccess' => mysql_now()));
$this->db->where('id', $projectId)->update('projects', array('last_access' => mysql_now()));
if ($result) {
return $this->_addShortName($result);
@@ -189,7 +193,7 @@ class Project extends CI_Model {
$data['owner'] = '215cd70f310ae6ae'; //$this->session->userdata('user_id');
$data['created'] = mysql_now();
$data['lastaccess'] = mysql_now();
$data['last_access'] = mysql_now();
do {
$data['id'] = random_hash();

6
application/views/header.php
View File

@@ -112,7 +112,7 @@
if (count($projects) > 0):
foreach ($this->project->getOwn() as $project):
?>
<li><?=anchor('projects/detail/' . $project['id'] . '?active_project=' . $project['id'], $project['mediumname']);?></li>
<li><a href="<?=site_url('projects/detail/' . $project['id'] . '?active_project=' . $project['id']);?>"<?=($project['public'] == 1) ? ' class="public"' : (($project['shares'] > 0) ? ' class="share"' : ' class="folder"');?>><?=$project['mediumname'];?></a></li>
<?php
endforeach;
else:
@@ -134,7 +134,7 @@
<?php
foreach ($projects as $project):
?>
<li><?=anchor('projects/detail/' . $project['id'] . '?active_project=' . $project['id'], $project['mediumname']);?></li>
<li><?=anchor('projects/detail/' . $project['id'] . '?active_project=' . $project['id'], $project['mediumname'], 'class="folder"');?></li>
<?php
endforeach;
?>
@@ -152,7 +152,7 @@
<?php
foreach ($projects as $project):
?>
<li><?=anchor('projects/detail/' . $project['id'] . '?active_project=' . $project['id'], $project['mediumname']);?></li>
<li><?=anchor('projects/detail/' . $project['id'] . '?active_project=' . $project['id'], $project['mediumname'], 'class="folder"');?></li>
<?php
endforeach;
?>