kopia lustrzana https://github.com/magicbug/Cloudlog
[Welcome] Might fix bug
rodzic
1ff1e541f6
commit
c08257beaa
|
@ -18,7 +18,7 @@ class Welcome extends CI_Controller {
|
|||
// load stations model
|
||||
$this->load->model('stations');
|
||||
$data['CountAllStationLocations'] = $this->stations->CountAllStationLocations();
|
||||
|
||||
|
||||
// load logbooks model
|
||||
$this->load->model('logbooks_model');
|
||||
$data['NumberOfStationLogbooks'] = $this->logbooks_model->CountAllStationLogbooks();
|
||||
|
@ -26,11 +26,10 @@ class Welcome extends CI_Controller {
|
|||
// load api model
|
||||
$this->load->model('api_model');
|
||||
$data['NumberOfAPIKeys'] = $this->api_model->CountKeysWithNoUserID();
|
||||
|
||||
|
||||
// load note model
|
||||
$this->load->model('note');
|
||||
$data['NumberOfNotes'] = $this->note->CountAllNotes();
|
||||
|
||||
|
||||
if($data['CountAllStationLocations'] == 0 || $data['NumberOfStationLogbooks'] == 0 || $data['NumberOfAPIKeys'] > 0 || $data['NumberOfNotes'] > 0) {
|
||||
// load views
|
||||
|
|
|
@ -9,7 +9,9 @@ class Logbooks_model extends CI_Model {
|
|||
|
||||
function CountAllStationLogbooks() {
|
||||
// count all logbooks
|
||||
return $this->db->count_all('station_logbooks');
|
||||
$this->db->where('user_id !=', NULL);
|
||||
$query = $this->db->get('station_logbooks');
|
||||
return $query->num_rows();
|
||||
}
|
||||
|
||||
function add() {
|
||||
|
|
|
@ -157,10 +157,9 @@ class Stations extends CI_Model {
|
|||
}
|
||||
|
||||
function CountAllStationLocations() {
|
||||
// count all logbooks
|
||||
// where user_id is not NULL
|
||||
$this->db->where('user_id !=', NULL);
|
||||
return $this->db->count_all('station_logbooks');
|
||||
$query = $this->db->get('station_profile');
|
||||
return $query->num_rows();
|
||||
}
|
||||
|
||||
function set_active($current, $new) {
|
||||
|
|
Ładowanie…
Reference in New Issue