Commit cdba63d7 authored by Laurent's avatar Laurent
Browse files

dev #56107 RT fix

parent 14246b13
......@@ -198,9 +198,7 @@ class Admin_WidgetController extends ZendAfi_Controller_Action {
$preferences,
true);
$html = Class_ScriptLoader::getInstance()->beAjax()->html() . $html;
$this->getResponse()->setHeader('Content-Type', 'application/json; charset=utf-8');
$this->getResponse()->setBody(json_encode(['content' => $html] ));
$this->_helper->json(['content' => $html]);
}
......
......@@ -177,7 +177,7 @@ class Class_Feature_List {
'Video' => 'https://www.youtube.com/watch?v=EF7Ud4n_NQU',
'Category' => $this->_('Administration'),
'Right' => function($feature_description, $user) {return true;},
'Wiki' => 'https://www.youtube.com/redirect?v=EF7Ud4n_NQU&event=video_description&q=http%3A%2F%2Fwiki.bokeh-library-portal.org%2Findex.php%3Ftitle%3DArticles_-_Cr%25C3%25A9er%2C_r%25C3%25A9diger_et_ordonner%23Ins.C3.A9rer_un_kiosque',
'Wiki' => 'http://wiki.bokeh-library-portal.org/index.php?title=Articles_-_Cr%C3%A9er,_r%C3%A9diger_et_ordonner#Ins.C3.A9rer_un_kiosque',
'Test' => '',
'Date' => '2017-12-25']
......
......@@ -109,7 +109,7 @@ class ZendAfi_View_Helper_CkEditor extends ZendAfi_View_Helper_BaseHelper
$config['kiosk_widget_url'] = Class_Url::assemble(['module' => 'admin',
'controller' => 'widget',
'action' => 'get-form',
'code' => 'KIOSQUE',
'code' => Class_Systeme_ModulesAccueil_Kiosque::CODE,
'render' => 'popup']);
$config['extraPlugins'] = 'colordialog,bokeh_kiosk';
......
......@@ -20,7 +20,7 @@ CKEDITOR.plugins.add( 'bokeh_kiosk', {
});
editor.contextMenu.addListener( function( element ) {
if ( $(element.$).hasClass('bokeh_kiosk') || $(element.$).closest('bokeh_kiosk').size ) {
if ( $(element.$).hasClass('bokeh_kiosk') || $(element.$).closest('bokeh_kiosk').length ) {
return { bokehKioskItem: CKEDITOR.TRISTATE_OFF };
}
});
......
......@@ -1670,8 +1670,8 @@ class CmsControllerDispatchViewSummaryTest extends AbstractControllerTestCase {
class CmsControllerWithArticleWithKioskTestCase extends AbstractControllerTestCase {
protected
abstract class CmsControllerWithArticleWithKioskTestCase extends AbstractControllerTestCase {
protected
$_storm_default_to_volatile = true;
protected function _loginHook($account) {
......@@ -1701,7 +1701,7 @@ class CmsControllerWithArticleWithKioskTestCase extends AbstractControllerTestCa
'exemplaires' => []]),
];
Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Notice')
$this->onLoaderOfModel('Class_Notice')
->whenCalled('findAllByRequeteRecherche')
->answers($records);
}
......
Markdown is supported
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