Merge pull request #97 from H2-invent/bugfix/teamProperties

Fixed Team Properties
H2-invent · Dec 6, 2020 · 0ab8ba9 · 0ab8ba9
2 parents 3e98fb3 + bb15693
commit 0ab8ba9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/Form/Type/SoftwareType.php b/src/Form/Type/SoftwareType.php
@@ -52,11 +52,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'choice_label' => 'name',
                 'class' => VVT::class,
                 'choices' => $options['processes'],
-                'label' => 'Mit dieser Software verbundene Verarbeitungen *',
+                'label' => 'Mit dieser Software verbundene Verarbeitungen',
                 'translation_domain' => 'form',
                 'multiple' => true,
                 'required' => true,
-                'expanded' => true
+                'attr' => [
+                    'class' => 'selectpicker',
+                    'data-live-search' => 'true'
+                ],
             ])
             ->add('datenweitergabe', EntityType::class, [
                 'choice_label' => 'gegenstand',
@@ -66,7 +69,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'translation_domain' => 'form',
                 'multiple' => true,
                 'required' => true,
-                'expanded' => true
+                'attr' => [
+                    'class' => 'selectpicker',
+                    'data-live-search' => 'true'
+                ],
             ])
             ->add('purchase', DateType::class, ['label' => 'Kaufdatum/Anschaffungsdatum', 'required' => false, 'translation_domain' => 'form', 'widget' => 'single_text'])
             ->add('build', TextType::class, ['label' => 'Version', 'required' => true, 'translation_domain' => 'form'])

diff --git a/src/Service/PoliciesService.php b/src/Service/PoliciesService.php
@@ -56,8 +56,8 @@ function clonePolicy(Policies $policy, User $user)
 
     function createForm(Policies $policies, Team $team)
     {
-        $personen = $this->em->getRepository(VVTPersonen::class)->findAll();
-        $kategorien = $this->em->getRepository(VVTDatenkategorie::class)->findAll();
+        $personen = $this->em->getRepository(VVTPersonen::class)->findByTeam($team);
+        $kategorien = $this->em->getRepository(VVTDatenkategorie::class)->findByTeam($team);
         $processes = $this->em->getRepository(VVT::class)->findActivByTeam($team);
 
         $form = $this->formBuilder->create(PolicyType::class, $policies, ['personen' => $personen, 'kategorien' => $kategorien, 'user' => $team->getMembers(), 'processes' => $processes]);

diff --git a/src/Service/VorfallService.php b/src/Service/VorfallService.php
@@ -55,8 +55,8 @@ function cloneVorfall(Vorfall $input, User $user)
 
     function createForm(Vorfall $vorfall, Team $team)
     {
-        $personen = $this->em->getRepository(VVTPersonen::class)->findAll();
-        $kategorien = $this->em->getRepository(VVTDatenkategorie::class)->findAll();
+        $personen = $this->em->getRepository(VVTPersonen::class)->findByTeam($team);
+        $kategorien = $this->em->getRepository(VVTDatenkategorie::class)->findByTeam($team);
 
         $form = $this->formBuilder->create(VorfallType::class, $vorfall, ['personen' => $personen, 'daten' => $kategorien]);
 

diff --git a/templates/client_request/base.html.twig b/templates/client_request/base.html.twig
@@ -22,7 +22,7 @@
                         Datenschutzcenter</a><br>
                     <a href="https://h2-invent.com" target="_blank" class="small">Made with ❤ by H2 invent •
                         2019-{{ 'now'|date('Y') }}
-                        • v{{ shivas_app_version }}r</a>
+                        • v{{ laf_version }}</a>
                 </div>
                 <div class="col-md-3 text-md-right d-none d-sm-block">
                     <img src="{{ asset('images/open-source-logo.png') }}" style="height: 50px">