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

hotline #75198 fix treeSelect js compatibilty with jquery 3

parent 4b5b5fd1
Branches
Tags
2 merge requests!2663Hotline,!2659Hotline#75198 affichage kiosque dans article sans correspondance avec nom domaine
Pipeline #4183 failed with stage
in 33 minutes and 28 seconds
- ticket #75198 : Administration : correction du composant de sélection de domaines ou de paniers dans les écrans de configurations.
\ No newline at end of file
......@@ -243,15 +243,8 @@ class Admin_CatalogueController extends ZendAfi_Controller_Action {
public function domainesPaniersJsonAction() {
$this->_helper->viewRenderer->setNoRender();
$data = [];
$data[] = $this->_user->getPaniersJson();
$data[] = (new Class_Catalogue())->getDomainesJson();
$data[] = (new Class_PanierNotice())->getPaniersAdminsNotInCatalogueJson();
$JSON = json_encode($data);
$this->getResponse()->setHeader('Content-Type', 'application/json; charset=utf-8');
$this->getResponse()->setBody($JSON);
$this->_helper->json([$this->_user->getPaniersJson(),
(new Class_Catalogue())->getDomainesJson(),
(new Class_PanierNotice())->getPaniersAdminsNotInCatalogueJson()]);
}
}
\ No newline at end of file
......@@ -24,7 +24,7 @@ class ZendAfi_Form_Element_DomainePanier extends ZendAfi_Form_Element_TreeSelect
public function __construct($spec, $options = null) {
$options = array_merge(['UrlDataSource' => Class_Url::assemble(['module' => 'admin',
'controller' => 'catalogue',
'action' => 'domaines-paniers']).'.json',
'action' => 'domaines-paniers-json']),
'MultipleSelection' => false,
'InputIdCategoriesName' => 'id_catalogue',
'InputIdItemsName' => 'id_panier',
......
......@@ -9,12 +9,18 @@
vertical-align: top;
}
.ui-treeselect-items-tree,
.ui-treeselect-items-tree {
overflow-y: scroll;
}
.ui-treeselect-selected-items {
max-height: 300px;
overflow-y: auto;
}
.ui-treeselect-items-tree ,
.ui-treeselect-selected-items {
max-height: 400px;
}
.ui-treeselect-items-tree {
width: 65%;
......
This diff is collapsed.
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