Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-10-14 01:09:41 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into doc/authorizaton-documentation-update

Browse Source
This commit is contained in:
Julien Fastré
2021-11-22 10:30:05 +01:00
parent e7fcebc99e 1194aaecaf
commit 98760bc5e8
300 changed files with 9998 additions and 5391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
View File

@@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Chill\DocStoreBundle\Controller;
use Chill\DocStoreBundle\Entity\DocumentCategory;
@@ -9,11 +11,9 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Chill\DocStoreBundle\ChillDocStoreBundle;
/**
* Class DocumentCategoryController
*
* @package Chill\DocStoreBundle\Controller
* @Route("/{_locale}/admin/document/category")
*/
class DocumentCategoryController extends AbstractController
@@ -24,11 +24,14 @@ class DocumentCategoryController extends AbstractController
public function index(): Response
{
$em = $this->getDoctrine()->getManager();
$categories = $em->getRepository("ChillDocStoreBundle:DocumentCategory")->findAll();
$categories = $em->getRepository(DocumentCategory::class)->findAll();
return $this->render(
'ChillDocStoreBundle:DocumentCategory:index.html.twig',
['document_categories' => $categories]);
[
'document_categories' => $categories,
]
);
}
/**
@@ -37,13 +40,10 @@ class DocumentCategoryController extends AbstractController
public function new(Request $request): Response
{
$em = $this->getDoctrine()->getManager();
$documentCategory = new DocumentCategory();
$documentCategory
->setBundleId('Chill\DocStoreBundle\ChillDocStoreBundle');
$documentCategory
->setIdInsideBundle(
$em->getRepository("ChillDocStoreBundle:DocumentCategory")
->nextIdInsideBundle());
$documentCategory = new DocumentCategory(
ChillDocStoreBundle::class,
$em->getRepository(DocumentCategory::class)->nextIdInsideBundle()
);
$documentCategory
->setDocumentClass(PersonDocument::class);
@@ -56,11 +56,10 @@ class DocumentCategoryController extends AbstractController
$em->flush();
return $this->redirectToRoute('document_category_index');
} else {
$documentCategory->setBundleId(
'Chill\DocStoreBundle\ChillDocStoreBundle');
}
$documentCategory->setBundleId(ChillDocStoreBundle::class);
return $this->render('ChillDocStoreBundle:DocumentCategory:new.html.twig', [
'document_category' => $documentCategory,
'form' => $form->createView(),

14
src/Bundle/ChillDocStoreBundle/DataFixtures/ORM/LoadDocumentACL.php
View File

@@ -38,7 +38,7 @@ class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface
return 35000;
}
public function load(ObjectManager $manager)
{
foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
@@ -57,15 +57,15 @@ class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface
break;
case 'administrative':
case 'direction':
if (in_array($scope->getName()['en'], array('administrative', 'social'))) {
if (in_array($scope->getName()['en'], array('administrative', 'social'), true)) {
printf("denying power on %s\n", $scope->getName()['en']);
break 2; // we do not want any power on social or administrative
}
}
break;
}
printf("Adding Person report acl to %s "
. "permission group, scope '%s' \n",
. "permission group, scope '%s' \n",
$permissionsGroup->getName(), $scope->getName()['en']);
$roleScopeUpdate = (new RoleScope())
->setRole(PersonDocumentVoter::CREATE)
@@ -83,9 +83,9 @@ class LoadDocumentACL extends AbstractFixture implements OrderedFixtureInterface
$manager->persist($roleScopeCreate);
$manager->persist($roleScopeDelete);
}
}
$manager->flush();
}

6
src/Bundle/ChillDocStoreBundle/EntityRepository/AccompanyingCourseDocumentRepository.php
View File

@@ -1,8 +1,10 @@
<?php
namespace Chill\DocStoreBundle\Repository;
declare(strict_types=1);
use App\Entity\AccompanyingCourseDocument;
namespace Chill\DocStoreBundle\EntityRepository;
use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry;

2
src/Bundle/ChillDocStoreBundle/EntityRepository/DocumentCategoryRepository.php
View File

@@ -34,6 +34,6 @@ class DocumentCategoryRepository extends EntityRepository
'SELECT MAX(c.idInsideBundle) + 1 FROM ChillDocStoreBundle:DocumentCategory c')
->getSingleResult();
return $array_res[1] ?: 0;
return reset($array_res);
}
}

34
src/Bundle/ChillDocStoreBundle/migrations/Version20211119173558.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
declare(strict_types=1);
namespace Chill\Migrations\DocStore;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
final class Version20211119173558 extends AbstractMigration
{
public function getDescription(): string
{
return 'remove comment on deprecated json_array type';
}
public function up(Schema $schema): void
{
$columns = [
'chill_doc.document_category.name',
'chill_doc.stored_object.key',
'chill_doc.stored_object.iv',
'chill_doc.stored_object.datas',
];
foreach ($columns as $col) {
$this->addSql("COMMENT ON COLUMN $col IS NULL");
}
}
public function down(Schema $schema): void
{
$this->throwIrreversibleMigrationException();
}
}