Role ++ (72d97e35) · Commits · Jean-Philippe Metivier / utilisateur

src/UnicaenUtilisateur/Controller/UtilisateurController.php

+2 −4

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@
		namespace UnicaenUtilisateur\Controller;

		use DateTime;
		use Mailing\Service\Mailing\MailingServiceAwareTrait;
		use UnicaenApp\Service\EntityManagerAwareTrait;
		use UnicaenApp\View\Model\CsvModel;
		use UnicaenUtilisateur\Entity\Db\Role;
		@@ -21,7 +20,6 @@ use Zend\View\Model\ViewModel;
		/** @method FlashMessenger flashMessenger() */

		class UtilisateurController extends AbstractActionController {
		use MailingServiceAwareTrait;
		use RoleServiceAwareTrait;
		use UserServiceAwareTrait;
		use EntityManagerAwareTrait;
		@@ -86,6 +84,8 @@ class UtilisateurController extends AbstractActionController {
		}
		}

		// TODO recup le provider qui va bien ...

		return new ViewModel([
		'utilisateur' => $utilisateur,
		'roles' => $roles,
		@@ -142,7 +142,6 @@ class UtilisateurController extends AbstractActionController {

		if ($utilisateur !== null && $role !== null) {
		$this->getUserService()->addRole($utilisateur, $role);
		//$this->getMailingService()->notificationChangementRole($utilisateur, $role, "ajout");
		}
		}

		@@ -172,7 +171,6 @@ class UtilisateurController extends AbstractActionController {

		if ($utilisateur !== null && $role !== null) {
		$this->getUserService()->removeRole($utilisateur,$role);
		// $this->getMailingService()->notificationChangementRole($utilisateur, $role, "retrait");
		}
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ namespace UnicaenUtilisateur\Controller;

		use Doctrine\ORM\EntityManager;
		use Interop\Container\ContainerInterface;
		use Mailing\Service\Mailing\MailingService;
		use UnicaenUtilisateur\Form\User\UserForm;
		use UnicaenUtilisateur\Service\Role\RoleService;
		use UnicaenUtilisateur\Service\User\UserService;
		@@ -27,7 +26,6 @@ class UtilisateurControllerFactory {
		*/
		$roleService = $container->get(RoleService::class);
		$userService = $container->get(UserService::class);
		$mailService = $container->get(MailingService::class);

		/**
		* @var UserForm $userForm
		@@ -38,7 +36,6 @@ class UtilisateurControllerFactory {
		$controller = new UtilisateurController();
		$controller->setRoleService($roleService);
		$controller->setUserService($userService);
		$controller->setMailingService($mailService);
		$controller->setUserForm($userForm);

		$controller->recherche = $rechercheServices;

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@
		<field name="roleId" type="string" column="role_id" length="64" nullable="false"/>
		<field name="libelle" type="string" column="libelle" length="64" nullable="false"/>
		<field name="isDefault" type="boolean" column="is_default" nullable="false"/>
		<field name="auto" type="boolean" column="is_auto" nullable="false"/>
		<field name="ldapFilter" type="string" column="ldap_filter" length="255" nullable="true"/>

		<many-to-many field="users" target-entity="UnicaenUtilisateur\Entity\Db\User" inversed-by="roles" fetch="LAZY">

+22 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,8 @@ use UnicaenPrivilege\Entity\Db\Privilege;

		class Role extends AbstractRole
		{
		/** @var boolean */
		private $auto;
		/** @var string */
		private $libelle;
		/** @var Collection (Privilege)*/
		@@ -90,5 +92,25 @@ class Role extends AbstractRole
		$this->libelle = $libelle;
		return $this;
		}

		/**
		* @return bool
		*/
		public function isAuto(): bool
		{
		if ($this->auto === null) return false;
		return $this->auto;
		}

		/**
		* @param bool $auto
		* @return Role
		*/
		public function setAuto(bool $auto): Role
		{
		$this->auto = $auto;
		return $this;
		}

		}

+16 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ class RoleForm extends Form {
		],
		]);
		//is default
		//parent
		$this->add([
		'type' => Select::class,
		'name' => 'is_default',
		@@ -84,6 +83,21 @@ class RoleForm extends Form {
		'id' => 'is_default',
		],
		]);
		//is auto
		$this->add([
		'type' => Select::class,
		'name' => 'is_auto',
		'options' => [
		'label' => "Est un rôle automatique * :",
		'value_options' => [
		'false' => 'Non',
		'true' => 'Oui',
		],
		],
		'attributes' => [
		'id' => 'is_auto',
		],
		]);
		//ldap filter
		$this->add([
		'type' => Text::class,
		@@ -146,6 +160,7 @@ class RoleForm extends Form {
		],
		'parent_id' => ['required' => false, ],
		'is_default' => ['required' => true, ],
		'is_auto' => ['required' => true, ],
		'ldap_fitler' => ['required' => false, ],
		'old-libelle' => ['required' => false, ],
		'old-roleid' => ['required' => false, ],