Commit 7619397e authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

- En cours PFI configuration

- Fix création du dossier dockerize/local
parent 387ae8a6
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -113,5 +113,5 @@ public/documentation
module/Demo

# DOCKER
dockerize/local
dockerize/local/*
!dockerize/local/.gitkeep
+3 −1
Original line number Diff line number Diff line
tmp
*-local
local/*
!local/.gitkeep
 No newline at end of file
+0 −0

Empty file added.

+5 −3
Original line number Diff line number Diff line
@@ -7,20 +7,22 @@ composer install
# PATH Access
chmod -R 777 data/DoctrineORMModule

# On attends que Postgresql soit UP
until PGPASSWORD="azerty" psql -h "£CONTAINER_POSTGRESQL" -U "oscar" "oscar_dev" -c '\q'; do
  >&2 echo "Postgres is unavailable - sleeping"
  sleep 1
  echo "Postgres is unavailable - sleeping"
  sleep 2
done

# DOCTRINE (MAJ Schema)
php vendor/bin/doctrine-module orm:schema-tool:update --force

### DEMO DATAS
### {{{DEMO
php bin/oscar.php auth:sync install/demo/authentification.json
php bin/oscar.php organizations:sync-json install/demo/organizations.json
php bin/oscar.php persons:sync-json install/demo/persons.json
php bin/oscar.php activity:import-json -f install/demo/activity.json
php bin/oscar.php check:privileges -n
php bin/oscar.php check:privileges -n
### DEMO}}}

exit 0
 No newline at end of file
+1 −7
Original line number Diff line number Diff line
@@ -411,16 +411,10 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif
            return $this->getResponseBadRequest("MAUVAISE UTILISATION ($method)");
        }


        $jsonFormatter = new JSONFormatter($this->getOscarUserContextService());


        return [
            'asAdmin' => $asAdmin,
            'rolesPerson' => $this->getPersonService()->getAvailableRolesPersonActivity(),
            'rolesOrganisation' => $jsonFormatter->objectsCollectionToJson(
                $this->getOrganizationService()->getAvailableRolesOrganisationActivity()
            ),
            'rolesOrganisation' => $this->getOrganizationService()->getAvailableRolesOrganisationActivity()
        ];
    }

Loading