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

Fix query in project->getOwn()

Browse Source
This commit is contained in:
Eike Foken
2011-09-28 20:52:47 +02:00
parent 3b379355bf
commit 14c1f2aa16
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/models/project.php
View File

@@ -60,7 +60,7 @@ class Project extends CI_Model {
public function getOwn() { public function getOwn() {
$this->db->select('projects.*, COUNT(shares.user_id) AS shares'); $this->db->select('projects.*, COUNT(shares.user_id) AS shares');
$this->db->join('shares', 'shares.project_id = projects.id', 'left'); $this->db->join('shares', 'shares.project_id = projects.id', 'left');
$this->db->group_by('shares.project_id'); $this->db->group_by('projects.id');
$this->db->where(array('owner' => $this->session->userdata('user_id'))); $this->db->where(array('owner' => $this->session->userdata('user_id')));
$query = $this->db->order_by('last_access DESC')->get('projects'); $query = $this->db->order_by('last_access DESC')->get('projects');
@@ -180,7 +180,7 @@ class Project extends CI_Model {
$query = $this->db->like('name', $needle)->get('projects'); $query = $this->db->like('name', $needle)->get('projects');
} else { } else {
$this->db->select('projects.*')->from('projects'); $this->db->select('projects.*')->from('projects');
$this->db->join('shares', 'shares.project_id = projects.id'); $this->db->join('shares', 'shares.project_id = projects.id', 'left');
$this->db->where("(`shares`.`user_id` = " . $this->db->escape($this->session->userdata('user_id')) $this->db->where("(`shares`.`user_id` = " . $this->db->escape($this->session->userdata('user_id'))
. " OR `projects`.`owner` = " . $this->db->escape($this->session->userdata('user_id')) . " OR `projects`.`owner` = " . $this->db->escape($this->session->userdata('user_id'))