From 866b7ada81c7d5252bce1e2667535dfebf9da232 Mon Sep 17 00:00:00 2001 From: afornerot Date: Fri, 15 May 2020 15:49:22 +0200 Subject: [PATCH] resolution de la creation des groupe en mode master LDAP (fixes #74) --- .../scripts/install/core-init-01.sql | 3 +-- .../src/Cadoles/CoreBundle/Form/GroupType.php | 4 ++-- .../Resources/public/themes/transnum/look.png | Bin 27748 -> 27748 bytes .../public/themes/transnum/transnum-logo.png | Bin 27748 -> 27748 bytes 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ninegate-1.0/scripts/install/core-init-01.sql b/src/ninegate-1.0/scripts/install/core-init-01.sql index db5ea41c..ad7cab2e 100644 --- a/src/ninegate-1.0/scripts/install/core-init-01.sql +++ b/src/ninegate-1.0/scripts/install/core-init-01.sql @@ -5,14 +5,13 @@ SET foreign_key_checks = 0; SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO'; INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES -(-100, 'DRAAF', '130007107'); +(-100, 'Interne', 'SIREN'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES (-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}yiDxhDNog19bkfbdXAX1PH2iZWUu5eGy ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); - TRUNCATE TABLE sidebar; INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `fonticon`, `permission`, `appactivate`) VALUES (1000, NULL, 1000, 'CONFIGURATION', NULL, 'fa-gear', 'ROLE_ADMIN,ROLE_MODO', ''), diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/GroupType.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/GroupType.php index aa708443..e898bed0 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/GroupType.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/GroupType.php @@ -54,7 +54,7 @@ class GroupType extends AbstractType "query_builder"=> function (EntityRepository $er) { return $er->createQueryBuilder('page')->where('page.parentfor=:parentfor')->setParameter('parentfor', 'group'); }, - "disabled" => ($options["mode"]=="delete"||$options["masteridentity"]!="SQL"?true:false), + "disabled" => ($options["mode"]=="delete"?true:false), "attr" => array("class" => "form-control", "style" => "margin-bottom:15px","readonly" => ($options["mode"]=="delete"?true:false)) ]); @@ -294,7 +294,7 @@ class GroupType extends AbstractType ); // Si masteridentity = LDAP alors on demande le filtre des utilisateurs qui appartiennent à ce groupe - if($options["masteridentity"]=="LDAP") + if($options["masteridentity"]=="LDAP"&&$options["access"]=="config") { $choices=array("oui" => "1","non" => "0"); $builder->add("fgassoc", diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png index 0b2ee11317895db4d0589bf51661809eec85fee6..8bcffd031afa1a650c7fdfbbb734622a929742c2 100644 GIT binary patch delta 24 gcmaEIgYn4?#tm0ZIa&F6Rps|AR0`gF&$P`90EWj2_W%F@ delta 24 gcmaEIgYn4?#tm0ZIhlC5L`7Z(pEuil&$P`90Elx6LjV8( diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png index 0b2ee11317895db4d0589bf51661809eec85fee6..8bcffd031afa1a650c7fdfbbb734622a929742c2 100644 GIT binary patch delta 24 gcmaEIgYn4?#tm0ZIa&F6Rps|AR0`gF&$P`90EWj2_W%F@ delta 24 gcmaEIgYn4?#tm0ZIhlC5L`7Z(pEuil&$P`90Elx6LjV8(