Merge branch 'master' into kusanagi (ec663f38) · Commits · open-source / oscar

module/Oscar/src/Oscar/Service/ProjectGrantApiService.php

+9 −5

Original line number	Diff line number	Diff line
		@@ -545,7 +545,7 @@ class ProjectGrantApiService implements

		$config = $this->getOscarConfigurationService()->getActivityFormConfigKeying();

		$out = [
		return [
		'id' => $activity->getId(),
		'label' => $activity->getLabel(),
		'numOscar' => $activity->getOscarNum(),
		@@ -572,7 +572,7 @@ class ProjectGrantApiService implements
		'edit' => $urlPlugin->fromRoute('contract/edit', ['id' => $activity->getId()]),
		'change_project' => $urlPlugin->fromRoute('contract/moveToProject', ['id' => $activity->getId()]),
		'new_project' => $urlPlugin->fromRoute('project/new') . '?ids=' . $activity->getId(),
		'pcru' => $urlPlugin->fromRoute('contract/pcru-informations', ['id' => $activity->getId()])
		'pcru' => $urlPlugin->fromRoute('contract/pcru-infos', ['id' => $activity->getId()])
		]
		];

		@@ -684,12 +684,16 @@ class ProjectGrantApiService implements
		);
		}
		} else {
		/**
		$allowProcessCreate = true;
		/** @var SignatureService $sService */
		$sService = $this->getServiceContainer()->get(SignatureService::class);
		if( !array_key_exists($doc->getFileTypeMime(), $sService->getSignatureConfigurationService()->getDocumentMimes())){
		$allowProcessCreate = false;
		}
		*/
		if (strpos($doc->getFileTypeMime(), 'application/pdf' ) !== false ){
		$allowProcessCreate = true;
		}
		}

		// Accès aux fonctionnalités du document.