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

Fix projects lists in header

Browse Source
This commit is contained in:
Eike Foken
2011-09-08 16:23:33 +02:00
parent 2a533dc9f1
commit afad9c3c89
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/models/project.php
View File

@@ -69,7 +69,7 @@ class Project extends CI_Model {
* *
* @return array The shared projects. * @return array The shared projects.
*/ */
private function getShared() { public function getShared() {
$this->load->library('session'); $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('lastaccess', 'desc')->where(array('user_id' => $this->session->userdata('user_id')));
$this->db->join('projects', 'projects.id = shares.project_id'); $this->db->join('projects', 'projects.id = shares.project_id');

41
application/views/header.php
View File

@@ -106,25 +106,31 @@
<a href="javascript:void(0);"><?=_('My projects');?></a> <a href="javascript:void(0);"><?=_('My projects');?></a>
<ul> <ul>
<?php <?php
$projects = $this->project->getOwn();
if (count($projects) > 0):
foreach ($this->project->getOwn() as $project): foreach ($this->project->getOwn() 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']);?></li>
<?php <?php
endforeach; endforeach;
else:
?>
<li><?=_("You haven't created a project yet.");?></li>
<li><?=anchor('projects/create', _('Create a project now'));?></li>
<?php
endif;
?> ?>
</ul> </ul>
</li> </li>
<?php
$projects = $this->project->getShared();
if (count($projects) > 0):
?>
<li class="togglable" id="nav_shared_projects"> <li class="togglable" id="nav_shared_projects">
<a href="javascript:void(0);"><?=_('Projects shared with me');?></a> <a href="javascript:void(0);"><?=_('Projects shared with me');?></a>
<ul> <ul>
<li><a href="#">Prisma</a></li>
</ul>
</li>
<li class="togglable" id="nav_public_projects">
<a href="javascript:void(0);"><?=_('Public projects');?></a>
<ul>
<?php <?php
foreach ($this->project->getPublic() as $project): 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']);?></li>
<?php <?php
@@ -132,6 +138,27 @@
?> ?>
</ul> </ul>
</li> </li>
<?php
endif;
$projects = $this->project->getPublic();
if (count($projects) > 0):
?>
<li class="togglable" id="nav_public_projects">
<a href="javascript:void(0);"><?=_('Public projects');?></a>
<ul>
<?php
foreach ($projects as $project):
?>
<li><?=anchor('projects/detail/' . $project['id'] . '?active_project=' . $project['id'], $project['mediumname']);?></li>
<?php
endforeach;
?>
</ul>
</li>
<?php
endif;
?>
</ul> </ul>
</div> </div>