Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
bibliossimo
opacce
Commits
cdba63d7
Commit
cdba63d7
authored
Jan 15, 2018
by
Laurent
Browse files
dev #56107 RT fix
parent
14246b13
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
9 deletions
+7
-9
application/modules/admin/controllers/WidgetController.php
application/modules/admin/controllers/WidgetController.php
+1
-3
library/Class/Feature/List.php
library/Class/Feature/List.php
+1
-1
library/ZendAfi/View/Helper/CkEditor.php
library/ZendAfi/View/Helper/CkEditor.php
+1
-1
public/opac/js/ckeditor_plugins/bokeh_kiosk/plugin.js
public/opac/js/ckeditor_plugins/bokeh_kiosk/plugin.js
+1
-1
tests/application/modules/opac/controllers/CmsControllerTest.php
...pplication/modules/opac/controllers/CmsControllerTest.php
+3
-3
No files found.
application/modules/admin/controllers/WidgetController.php
View file @
cdba63d7
...
...
@@ -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
]);
}
...
...
library/Class/Feature/List.php
View file @
cdba63d7
...
...
@@ -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'
=>
'http
s
://
www.youtube.com/redirect?v=EF7Ud4n_NQU&event=video_description&q=http%3A%2F%2F
wiki.bokeh-library-portal.org
%2F
index.php
%3F
title
%3D
Articles_-_Cr%
25
C3%
25
A9er
%2C
_r%
25
C3%
25
A9diger_et_ordonner
%23
Ins.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'
]
...
...
library/ZendAfi/View/Helper/CkEditor.php
View file @
cdba63d7
...
...
@@ -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'
;
...
...
public/opac/js/ckeditor_plugins/bokeh_kiosk/plugin.js
View file @
cdba63d7
...
...
@@ -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
};
}
});
...
...
tests/application/modules/opac/controllers/CmsControllerTest.php
View file @
cdba63d7
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment