Commit 3f02add2 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

La modale d'avertissement dans le formulaire de modification des... 

La modale d'avertissement dans le formulaire de modification des organisations/personnes n'est plus affichée pour les organisations/personnes ayant été synchonisées initalement par un connecteur qui n'est pas référencé dans la configuration. (Typiquement, lors de l'utilisation d'un import initial).
parent 6cae024f

module/Oscar/src/Oscar/Controller/OrganizationController.php

+0 −1
Changes for module/Oscar/src/Oscar/Controller/OrganizationController.php: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -740,7 +740,6 @@ class OrganizationController extends AbstractOscarController 
        $id = $this->params()->fromRoute('id', 0);

        $em = $this->getEntityManager();





        $result = $em->createQueryBuilder()

            ->select('p')

            ->from(Organization::class, 'p')

module/Oscar/src/Oscar/Entity/Organization.php

+4 −1
Changes for module/Oscar/src/Oscar/Entity/Organization.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -60,9 +60,12 @@ class Organization implements ResourceInterface, IConnectedObject 


    /**

     * Return TRUE si l'objet a un connector.

     * Si $connecteur est renseigné, localise le teste uniquement sur ce connecteur

     */

    public function isConnected(){

    public function isConnected( $connectors = null){



        foreach ($this->getConnectors() as $connector=>$value ){

            if( $connectors != null && !in_array($connector, $connectors) ) continue;

            if( $value ){

                return true;

            }

module/Oscar/src/Oscar/Entity/Person.php

+2 −1
Changes for module/Oscar/src/Oscar/Entity/Person.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -208,8 +208,9 @@ class Person implements ResourceInterface 
    /**

     * Return TRUE si l'objet a un connector.

     */

    public function isConnected(){

    public function isConnected( $connectors = null){

        foreach ($this->getConnectors() as $connector=>$value ){

            if( $connectors != null && !in_array($connector, $connectors) ) continue;

            if( $value ){

                return true;

            }

module/Oscar/view/oscar/organization/form.phtml

+1 −1
Changes for module/Oscar/view/oscar/organization/form.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 






    <?php if($organization && $organization->isConnected()): ?>

    <?php if($organization && $organization->isConnected($connectors)): ?>

        <div class="modal fade" tabindex="-1" role="dialog" id="infos">

            <div class="modal-dialog" role="document">

                <div class="modal-content">

module/Oscar/view/oscar/person/form.phtml

+1 −1
Changes for module/Oscar/view/oscar/person/form.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


</style>

<div class="container">

    <?php if($person && $person->isConnected()): ?>

    <?php if($person && $person->isConnected($connectors)): ?>

        <div class="modal fade" tabindex="-1" role="dialog" id="infos">

            <div class="modal-dialog" role="document">

                <div class="modal-content">