Merge branch 'develop' into release/3.1

OpenConext · Mar 16, 2020 · 3adf37d · 3adf37d
2 parents a8106ff + 8b1ecd5
commit 3adf37d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.1.3
+**Bugfix**
+ * Allow updating the location of an RA  #235
+
 ## 3.1.2
 **Bugfix**
  * Repair the token export feature #234 

diff --git a/src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php b/src/Surfnet/StepupRa/RaBundle/Controller/RaManagementController.php
@@ -234,7 +234,7 @@ public function amendRaInformationAction(Request $request, $identityId, $raInsti
 
         $command = new AmendRegistrationAuthorityInformationCommand();
         $command->identityId = $raListing->identityId;
-        $command->location = $this->getUser()->institution;
+        $command->location = $raListing->location;
         $command->contactInformation = $raListing->contactInformation;
         $command->institution = $raListing->raInstitution;