Merge branch 'fouten/kamerversiesbijambities' into develop
# Conflicts: # application/controllers/monpas/Streefcijfers.php
This commit is contained in:
@@ -302,8 +302,8 @@ class Streefcijfers extends MY_Controller{
|
||||
$onderliggend = '';
|
||||
$scholen = $this->Organisaties_model->get_onderliggende_orgs($this->globorgid);
|
||||
foreach($scholen AS $school){
|
||||
$onderliggend .= $school->id . ',';
|
||||
}
|
||||
$onderliggend .= $school->id . ',';
|
||||
}
|
||||
$onderliggend = rtrim($onderliggend, ',');
|
||||
if ($orgversie) $ambities = $this->Ambities_model->mh_get_ambities($module, $this->globorgid, $orgversie->orgversieID);
|
||||
if (!$ambities) $ambities = $this->Ambities_model->mh_get_ambities($module, $kamer, $orgversie->orgversieID);
|
||||
|
||||
Reference in New Issue
Block a user