Merge branch 'develop' into release/3.1

OpenConext · Feb 27, 2020 · 7463bff · 7463bff
2 parents d4412a8 + 282886a
commit 7463bff
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## 3.1.1
+**Bugfix**
+ * Remove filter from ra candidate search form #233
+
+## 3.1.0
+A release with bugfixes after initial FGA test:
+ * Update translations #228
+ * Improve button-group button alignment #231
+ * Fix exception controller authentication exceptions #232
+ * Remove unused select_raa code #230
+ * Security updates #229
+ * Test php 7.3 with travis #224
+
 ## 3.0.1
 This is a security release that will harden the application against CVE 2019-346
  * Upgrade Stepup-saml-bundle to version 4.1.8 

diff --git a/src/Surfnet/StepupRa/RaBundle/Command/SearchRaCandidatesCommand.php b/src/Surfnet/StepupRa/RaBundle/Command/SearchRaCandidatesCommand.php
@@ -79,9 +79,4 @@ class SearchRaCandidatesCommand
      * @var array
      */
     public $institutionFilterOptions;
-
-    /**
-     * @var array
-     */
-    public $raInstitutionFilterOptions;
 }
diff --git a/src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php b/src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php
@@ -126,7 +126,6 @@ public function raCandidateSearchAction(Request $request)
 
         // The options that will populate the institution filter choice list.
         $command->institutionFilterOptions = $raCandidateList->getFilterOption('institution');
-        $command->raInstitutionFilterOptions = $raCandidateList->getFilterOption('raInstitution');
 
         $form = $this->createForm(SearchRaCandidatesType::class, $command, ['method' => 'get']);
         $form->handleRequest($request);

diff --git a/src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php b/src/Surfnet/StepupRa/RaBundle/Form/Type/SearchRaCandidatesType.php
@@ -32,7 +32,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         /** @var $command SearchRaCandidatesCommand */
         $command = $builder->getData();
         $institutions = $command->institutionFilterOptions;
-        $raInstitutions = $command->raInstitutionFilterOptions;
 
         $builder
             ->add('name', null, [
@@ -46,11 +45,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'choices' => $institutions,
                 'required' => false,
             ])
-            ->add('raInstitution', ChoiceType::class, [
-                'label' => 'ra.form.ra_search_ra_candidates.label.raInstitution',
-                'choices' => $raInstitutions,
-                'required' => false,
-            ])
             ->add('search', SubmitType::class, [
                 'label' => 'ra.form.ra_search_ra_candidates.button.search',
                 'attr'  => ['class' => 'btn btn-primary search-button'],