diff --git a/application/modules/Business/views/business_list.php b/application/modules/Business/views/business_list.php index e69493a..8ad1976 100644 --- a/application/modules/Business/views/business_list.php +++ b/application/modules/Business/views/business_list.php @@ -58,7 +58,7 @@   - + diff --git a/application/modules/User/controllers/User.php b/application/modules/User/controllers/User.php index e573a93..c2a747e 100644 --- a/application/modules/User/controllers/User.php +++ b/application/modules/User/controllers/User.php @@ -47,7 +47,7 @@ public function userList() $user_list = $this->user_model->get_admin(); } else if(is_admin()) { - $user_list = $this->user_model->get_user(user()->business_id); + $user_list = $this->user_model->get_user( md5(user()->id) , user()->business_id); } $this->layout->set('tableData', $user_list); $this->layout->buffer('main_content', 'User/user_list'); diff --git a/application/modules/User/models/User_model.php b/application/modules/User/models/User_model.php index aefc847..8bfaabc 100644 --- a/application/modules/User/models/User_model.php +++ b/application/modules/User/models/User_model.php @@ -1,13 +1,13 @@ db->select('*'); $this->db->from('users'); $this->db->where('business_id', $business_id); $this->db->order_by('id','DESC'); - // $this->db->where('role', 'user'); + $this->db->where('md5(id) !=', $id); // $this->db->where('role', 'user'); // $this->db->where('is_active', 1); $query = $this->db->get(); @@ -42,7 +42,9 @@ public function get_user_by_md5_id($id,$business_id) public function delete_user_by_md5_id($id,$business_id) { $this->db->where('md5(id)', $id); - $this->db->where('business_id', $business_id); + if ($business_id != NULL) { + $this->db->where('business_id', $business_id); + } $this->db->set('is_active',0); $this->db->update('users'); return; @@ -51,7 +53,9 @@ public function delete_user_by_md5_id($id,$business_id) public function activate_inactive_users($id,$business_id) { $this->db->where('md5(id)', $id); + if ($business_id != NULL) { $this->db->where('business_id', $business_id); + } $this->db->set('is_active',1); $this->db->update('users'); return; diff --git a/application/modules/User/views/user_list.php b/application/modules/User/views/user_list.php index 6a4481d..c4a7059 100644 --- a/application/modules/User/views/user_list.php +++ b/application/modules/User/views/user_list.php @@ -38,13 +38,13 @@   - + is_active == 0) { ?>   - +