Skip to content
Snippets Groups Projects
Commit 8643bc4a authored by Ghislain Loas's avatar Ghislain Loas
Browse files

dev rel #17078 fix tests failures

parent 1d923a57
Branches
Tags
5 merge requests!545Master,!544Master,!543Master,!538Dev#17078 view record in specific profile,!532Dev#17078 view record in specific profile
......@@ -38,7 +38,7 @@ class JavaController extends ZendAfi_Controller_Action {
public function kiosqueAction() {
$preferences = array_merge(Class_Systeme_ModulesAccueil::getInstance()->getValeursParDefaut('KIOSQUE'),
$this->extractProfilFromUrl()->getModuleAccueilPreferences($this->getPreferenceIdModule(), 'KIOSQUE'));
$this->extractProfilFromUrl()->getModuleAccueilPreferences($this->extractIdModuleFromUrl(), 'KIOSQUE'));
$this->view->preferences = $preferences;
$params = $this->_request->getParams();
......
......@@ -197,8 +197,9 @@ class ZendAfi_Controller_Action_Helper_View extends Zend_View {
public function getMainTitle() {
$count = count($this->_titles);
return isset($this->_titles[$count-1]) ? $this->_titles[$count-1] : '';
if ($title = end($this->_titles))
return $title;
return $this->titre ? $this->titre : '';
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment