diff --git a/migrations/Version20220404160148.php b/migrations/Version20220404160148.php new file mode 100644 index 0000000..05f502e --- /dev/null +++ b/migrations/Version20220404160148.php @@ -0,0 +1,34 @@ +addSql('UPDATE document SET `need_group_administration`="0" WHERE `dtype`="template"'); + + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + + } +} diff --git a/package.json b/package.json index 6a3252e..717ab45 100644 --- a/package.json +++ b/package.json @@ -1,3 +1,3 @@ { - "version": "0.1.0" + "version": "0.1.1" } diff --git a/src/Controller/AdminController.php b/src/Controller/AdminController.php index a9d3a81..e688c6b 100644 --- a/src/Controller/AdminController.php +++ b/src/Controller/AdminController.php @@ -98,9 +98,12 @@ class AdminController extends AbstractController } #[Route('/user/view/{id}', name: 'user_view')] - public function userView(PaginatorInterface $paginator, User $User): Response + public function userView(PaginatorInterface $paginator, User $User, Request $request): Response { - $pagination = $paginator->paginate($User->getDocuments()); + $pagination = $paginator->paginate( + $User->getDocuments(), + $request->query->getInt('page', 1) + ); return $this->render('admin/user_view.html.twig', [ 'controller_name' => 'AdminController', 'user' => $User, diff --git a/src/Controller/DirectoryController.php b/src/Controller/DirectoryController.php index b8dce1c..c4ebef6 100644 --- a/src/Controller/DirectoryController.php +++ b/src/Controller/DirectoryController.php @@ -54,7 +54,8 @@ class DirectoryController extends AbstractController } $pagination = $paginator->paginate( - $req->getResult() + $req->getResult(), + $request->query->getInt('page', 1) ); return $this->render('directory/list.html.twig', [ diff --git a/src/Controller/FolderController.php b/src/Controller/FolderController.php index d36a6c0..5562217 100644 --- a/src/Controller/FolderController.php +++ b/src/Controller/FolderController.php @@ -50,7 +50,8 @@ class FolderController extends AbstractController } $pagination = $paginator->paginate( - $req->getResult() + $req->getResult(), + $request->query->getInt('page', 1) ); @@ -141,7 +142,8 @@ class FolderController extends AbstractController } $pagination = $paginator->paginate( - $req->getResult() + $req->getResult(), + $request->query->getInt('page', 1) ); return $this->render('folder/document.html.twig', [ diff --git a/src/Controller/MeController.php b/src/Controller/MeController.php index 80056dc..e8da58a 100644 --- a/src/Controller/MeController.php +++ b/src/Controller/MeController.php @@ -55,7 +55,10 @@ class MeController extends AbstractController return $this->render('me/index.html.twig', [ 'controller_name' => 'MeController', 'form' => $form->createView(), - 'pagination' => $paginator->paginate($user->getDocuments()) + 'pagination' => $paginator->paginate( + $user->getDocuments(), + $request->query->getInt('page', 1) + ) ]); } diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index 10ce922..08e216e 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -52,13 +52,22 @@ class UserController extends AbstractController } #[Route('/view/{id}/sanctions', name: 'view_sanctions')] - public function viewSanctions(PaginatorInterface $paginator, User $User): Response + public function viewSanctions(PaginatorInterface $paginator, User $User, Request $request): Response { - $group = $this->getUser()->getMainGroup(); + /** + * @var User $user + */ + $user = $this->getUser(); + + $group = $user->getMainGroup(); + if (!$this->IsGranted('sanction', $group)) { throw new AccessDeniedHttpException("granted_not_allowed_to_view_sanctions"); } - $pagination = $paginator->paginate($User->getSanctions()); + $pagination = $paginator->paginate( + $User->getSanctions(), + $request->query->getInt('page', 1) + ); return $this->render('user/sanctions.html.twig', [ 'controller_name' => 'UserController', 'user' => $User, @@ -67,9 +76,12 @@ class UserController extends AbstractController } #[Route('/view/{id}/documents', name: 'view_documents')] - public function viewDocuments(PaginatorInterface $paginator, User $User): Response + public function viewDocuments(PaginatorInterface $paginator, User $User, Request $request): Response { - $pagination = $paginator->paginate($User->getDocuments()); + $pagination = $paginator->paginate( + $User->getDocuments(), + $request->query->getInt('page', 1) + ); return $this->render('user/documents.html.twig', [ 'controller_name' => 'UserController', 'user' => $User, diff --git a/src/Entity/Template.php b/src/Entity/Template.php index 18e58d9..0b6d5eb 100644 --- a/src/Entity/Template.php +++ b/src/Entity/Template.php @@ -15,7 +15,6 @@ class Template extends Document public function __construct(User $user) { parent::__construct($user); - $this->setNeedGroupAdministration(true); } /** diff --git a/src/Form/TestType.php b/src/Form/TestType.php index c4bee01..e51431a 100644 --- a/src/Form/TestType.php +++ b/src/Form/TestType.php @@ -26,8 +26,6 @@ class TestType extends AbstractType */ $User = $this->TokenStorage->getToken()->getUser(); - dd($User); - $builder ->add('title', null, [ 'label' => 'form_label_title', diff --git a/src/PermissionsList.php b/src/PermissionsList.php index 4cb5853..0eb2430 100644 --- a/src/PermissionsList.php +++ b/src/PermissionsList.php @@ -111,9 +111,6 @@ class PermissionsList } } - //dd($buildedPermissions); - - return $buildedPermissions; } diff --git a/src/Repository/Tools/DocumentRepositoriesExtension.php b/src/Repository/Tools/DocumentRepositoriesExtension.php index b47639c..c7a362d 100644 --- a/src/Repository/Tools/DocumentRepositoriesExtension.php +++ b/src/Repository/Tools/DocumentRepositoriesExtension.php @@ -61,6 +61,8 @@ class DocumentRepositoriesExtension extends ServiceEntityRepository + + if (!$User->hasPermission('group_ignore_subgroups')) { $this->qb->andWhere('d.allowedSubGroups is empty'); foreach ($User->getSubGroups() as $key => $subG) { @@ -76,6 +78,7 @@ class DocumentRepositoriesExtension extends ServiceEntityRepository if (!$User->hasPermission('general_medical_view')) { $this->qb->andWhere('d.needMedicalAccess = 0'); } + if (!$User->hasPermission('group_administrate')) { $this->qb->andWhere('d.needGroupAdministration = 0'); } diff --git a/src/Twig/VersionExtension.php b/src/Twig/VersionExtension.php new file mode 100644 index 0000000..70a4d1c --- /dev/null +++ b/src/Twig/VersionExtension.php @@ -0,0 +1,22 @@ +version; + } +} diff --git a/templates/_cells/directoryCard.html.twig b/templates/_cells/directoryCard.html.twig index 03f9479..6907e90 100644 --- a/templates/_cells/directoryCard.html.twig +++ b/templates/_cells/directoryCard.html.twig @@ -20,7 +20,7 @@ {% if directory.leftImageSize != 0 %}{% set leftImage = path_directories_uploads ~ '/' ~ directory.leftImageName %}{% else %}{% set leftImage = 'img/nophoto.jpg' %}{% endif %}
- {{ directory.fullname}} + {{ directory.fullname}}
{% if directory.idCardImageSize != 0 %} diff --git a/templates/base.html.twig b/templates/base.html.twig index ee17926..c82ca70 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -176,6 +176,10 @@ list{% trans %}title_logs{% endtrans %} {% endif %} +
  • + + Vision: {{ vision_version() }} +
  • diff --git a/templates/document/types/Jail.html.twig b/templates/document/types/Jail.html.twig index 86f6aac..07bf645 100644 --- a/templates/document/types/Jail.html.twig +++ b/templates/document/types/Jail.html.twig @@ -4,8 +4,8 @@