Commit 615f7fac authored by Thomas Hamel's avatar Thomas Hamel
Browse files

ajout du privilège individu/lister aux gestionnaires, et suppression de...

ajout du privilège individu/lister aux gestionnaires, et suppression de l'utilisation de l'action utilisateurcontroller/rechercherIndividu qui faisait doublon
parent 462e9137
Loading
Loading
Loading
Loading
+4 −2
Changes for doc/release-notes/8.x.0/01_saisie_these.sql: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -632,9 +632,11 @@ where exists (
      and pp.profil_id = pp1.profil_id and pp.privilege_id = pp1.privilege_id
);

-- Suppression du privilège pour le Gestionnaire d'ED pour modifier leur thèse
-- Ajout du privilège pour le Gestionnaire d'ED pour modifier leur thèse, et rechercher des individus
INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID)
with data(categ, priv) as (select 'these', 'modification-de-ses-theses')
with data(categ, priv) as (select 'these', 'modification-de-ses-theses'
                           union
                           select 'individu', 'lister')
select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID
from data
         join PROFIL on profil.ROLE_ID in (
+5 −8
Changes for module/Application/src/Application/Controller/UtilisateurController.php: 5 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ use Formation\Service\Session\SessionServiceAwareTrait;
use Individu\Controller\IndividuController;
use Individu\Entity\Db\Individu;
use Individu\Service\IndividuServiceAwareTrait;
use JetBrains\PhpStorm\Deprecated;
use Laminas\Authentication\AuthenticationService;
use Laminas\EventManager\EventInterface;
use Laminas\Http\Request;
@@ -175,14 +176,10 @@ class UtilisateurController extends \UnicaenAuth\Controller\UtilisateurControlle

    }

    /**
     * AJAX.
     *
     * Recherche d'un Individu.
     *
     * @param string|null $type => permet de spécifier un type d'acteur ...
     * @return JsonModel
     */
    #[Deprecated(
        reason: 'Utiliser IndividuController::rechercherAction à la place.',
        replacement: 'IndividuController::rechercherAction')
    ]
    public function rechercherIndividuAction(?string $type = null) : JsonModel
    {
        $type = $this->params()->fromQuery('type');
+2 −1
Changes for module/Application/view/application/mail-confirmation/index.phtml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ use UnicaenApp\Form\Element\SearchAndSelect;
        $sas = new SearchAndSelect('individu');
        $sas->setLabel($this->translate("Recherche d'un individu à ajouter :"));
        $sas->setAttribute('class', 'individu-finder');
        $sas->setAutocompleteSource($this->url('utilisateur/rechercher-individu',[],[],true));
        /** @see IndividuController::rechercherAction() */
        $sas->setAutocompleteSource($this->url('individu/rechercher',[],[],true));
        echo $this->formControlGroup($sas, 'formSearchAndSelect');
        echo "<input type='submit' value='ajouter'/>";
        echo "</form>";
+2 −1
Changes for module/Application/view/application/utilisateur/lier-individu.phtml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -177,7 +177,8 @@ use UnicaenApp\Form\Element\SearchAndSelect;
            $sas->setAttribute('id', $sasId = uniqid('sas_'));
            $sas->setLabel($this->translate("Recherche d'un individu"));
            $sas->setAttribute('class', 'individu-finder');
            $sas->setAutocompleteSource($this->url('utilisateur/rechercher-individu', [], [], true));
            /** @see IndividuController::rechercherAction() */
            $sas->setAutocompleteSource($this->url('individu/rechercher', [], [], true));
            echo $this->formControlGroup($sas, 'formSearchAndSelect');
            ?>

+2 −1
Changes for module/Depot/view/depot/fichier-these/deposes.phtml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ use UnicaenApp\Form\Element\SearchAndSelect;
        $sas = new SearchAndSelect('individu');
        $sas->setLabel($this->translate("Filtrage selon un doctorant :"));
        $sas->setAttribute('class', 'individu-finder');
        $sas->setAutocompleteSource($this->url('utilisateur/rechercher-individu', [], [], true));
        /** @see IndividuController::rechercherAction() */
        $sas->setAutocompleteSource($this->url('individu/rechercher', [], [], true));
        echo $this->formControlGroup($sas, 'formSearchAndSelect');
        ?>
    </div>
Loading