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

Merge branch 'master' of disposed.de:scattport

Browse Source
This commit is contained in:
Karsten Heiken
2011-09-16 16:38:59 +02:00
parent f3f4625bbf 9e58475a32
commit 347ea4416e
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/models/project.php
View File

@@ -98,7 +98,11 @@ class Project extends CI_Model {
* @param string $userId * @param string $userId
* @return array All accessible projects * @return array All accessible projects
*/ */
public function getAccessible($userId) { public function getAccessible($userId = '') {
if (empty($userId)) {
$userId = $this->session->userdata('user_id');
}
$shares = array(); $shares = array();
$query = $this->db->get_where('shares', array('user_id' => $userId)); $query = $this->db->get_where('shares', array('user_id' => $userId));
foreach ($query->result_array() as $share) { foreach ($query->result_array() as $share) {

7
application/views/header.php
View File

@@ -51,7 +51,12 @@
<option disabled="disabled" selected="selected"><strong><?=_('Select a project');?></strong></option> <option disabled="disabled" selected="selected"><strong><?=_('Select a project');?></strong></option>
<?php <?php
endif; endif;
foreach ($this->project->getAll() as $project): if ($this->access->isAdmin()) {
$theProjects = $this->project->getAll();
} else {
$theProjects = $this->project->getAccessible();
}
foreach ($theProjects as $project):
?> ?>
<option title="<?=$project['name']?>" value="<?=site_url('projects/detail/' . $project['id']) . '?active_project=' . $project['id'];?>"<?=($active_project['id'] == $project['id']) ? ' selected' : '';?>><?=$project['mediumname'];?></option> <option title="<?=$project['name']?>" value="<?=site_url('projects/detail/' . $project['id']) . '?active_project=' . $project['id'];?>"<?=($active_project['id'] == $project['id']) ? ' selected' : '';?>><?=$project['mediumname'];?></option>
<?php <?php