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

Actually check which user is logged in

Browse Source
This commit is contained in:
Karsten Heiken
2011-04-22 01:07:05 +02:00
parent 78b7dd808a
commit 32478703f6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/jobs.php
View File

@@ -4,7 +4,7 @@ class Jobs extends CI_Controller {
public function getOwn() { public function getOwn() {
$query = $this->db->order_by('progress', 'desc') $query = $this->db->order_by('progress', 'desc')
->get_where('jobs', array('started_by' => '215cd70f310ae6ae')); ->get_where('jobs', array('started_by' => $this->session->user_data('id')));
$count = $query->num_rows(); $count = $query->num_rows();
$jobs = $query->result_array(); $jobs = $query->result_array();
@@ -39,7 +39,7 @@ class Jobs extends CI_Controller {
public function listResultsNotSeen() { public function listResultsNotSeen() {
$query = $this->db->order_by('started_at', 'asc') $query = $this->db->order_by('started_at', 'asc')
->get_where('jobs', array('started_by' => '215cd70f310ae6ae', 'seen' => '0')); ->get_where('jobs', array('started_by' => $this->session->user_data('id'), 'seen' => '0'));
$count = $query->num_rows(); $count = $query->num_rows();
$jobs = $query->result_array(); $jobs = $query->result_array();

4
application/models/project.php
View File

@@ -14,7 +14,7 @@ class Project extends CI_Model {
* @return array The user's projects. * @return array The user's projects.
*/ */
public function getOwn() { public function getOwn() {
$query = $this->db->where(array('owner' => '215cd70f310ae6ae')) $query = $this->db->where(array('owner' => $this->session->user_data('id')))
->order_by('lastaccess', 'desc') ->order_by('lastaccess', 'desc')
->get('projects'); ->get('projects');
$projects = $query->result_array(); $projects = $query->result_array();
@@ -38,7 +38,7 @@ class Project extends CI_Model {
* @return array The shared projects. * @return array The shared projects.
*/ */
public function getShared() { public function getShared() {
$this->db->select('*')->from('shares')->order_by('lastaccess', 'desc')->where(array('user_id' => '215cd70f310ae6ae')); $this->db->select('*')->from('shares')->order_by('lastaccess', 'desc')->where(array('user_id' => $this->session->user_data('id')));
$this->db->join('projects', 'projects.id = shares.project_id'); $this->db->join('projects', 'projects.id = shares.project_id');
$query = $this->db->get(); $query = $this->db->get();