Remove href attributes and fix form processing

Author: stevenrombauts

src/Controller/PackageController.php

@@ -998,28 +998,34 @@ public function transferPackageAction(Request $req, #[MapEntity] Package $packag
         $form = $this->createTransferPackageForm($package);
         $form->handleRequest($req);
 
-        if ($form->isSubmitted() && $form->isValid()) {
-            try {
-                $newMaintainers = $form->getData()->getMaintainers()->toArray();
-                $result = $this->packageManager->transferPackage($package, $newMaintainers);
-                $this->getEM()->flush();
-
-                if ($result) {
-                    $usernames = array_map(fn (User $user) => $user->getUsername(), $newMaintainers);
-                    $this->addFlash('success', sprintf('Package has been transferred to %s', implode(', ', $usernames)));
-                } else {
-                    $this->addFlash('warning', 'Package maintainers are identical and have not been changed');
-                }
+        if (!$form->isSubmitted()) {
+            return $this->redirectToRoute('view_package', ['name' => $package->getName()]);
+        }
 
-                return $this->redirectToRoute('view_package', ['name' => $package->getName()]);
-            } catch (\Exception $e) {
-                $logger->critical($e->getMessage(), ['exception', $e]);
-                $this->addFlash('error', 'The package could not be transferred.');
-            }
-        } elseif (!$form->isValid()) {
+        if (!$form->isValid()) {
             foreach ($form->getErrors(true, true) as $error) {
                 $this->addFlash('error', $error->getMessage());
             }
+
+            return $this->redirectToRoute('view_package', ['name' => $package->getName()]);
+        }
+
+        try {
+            $newMaintainers = $form->getData()->getMaintainers()->toArray();
+            $result = $this->packageManager->transferPackage($package, $newMaintainers);
+            $this->getEM()->flush();
+
+            if ($result) {
+                $usernames = array_map(fn (User $user) => $user->getUsername(), $newMaintainers);
+                $this->addFlash('success', sprintf('Package has been transferred to %s', implode(', ', $usernames)));
+            } else {
+                $this->addFlash('warning', 'Package maintainers are identical and have not been changed');
+            }
+
+            return $this->redirectToRoute('view_package', ['name' => $package->getName()]);
+        } catch (\Exception $e) {
+            $logger->critical($e->getMessage(), ['exception', $e]);
+            $this->addFlash('error', 'The package could not be transferred.');
         }
 
         return $this->redirectToRoute('view_package', ['name' => $package->getName()]);

templates/package/view_package.html.twig

@@ -145,12 +145,12 @@
                                     <a href="{{ path('user_profile', {'name': maintainer.username}) }}"><img width="48" height="48" title="{{ maintainer.username }}" src="https://www.gravatar.com/avatar/{{ maintainer.email|gravatar_hash }}?s=48&amp;d=identicon" srcset="https://www.gravatar.com/avatar/{{ maintainer.email|gravatar_hash }}?s=96&amp;d=identicon 2x"></a>
                                 {% endfor %}
                             </p>
-                            
+
                             {% if is_granted('remove_maintainer', package) or is_granted('add_maintainer', package) or is_granted('transfer_package', package) %}
                                 <h5>Maintainer actions</h5>
-                                {% if is_granted('add_maintainer', package) %}<a title="Add Maintainer" id="add-maintainer" href="{{ path('add_maintainer', {'name': package.name}) }}"><i class="glyphicon glyphicon-plus"></i></a>{% endif %}
-                                {% if is_granted('remove_maintainer', package) %}<a title="Remove Maintainer" id="remove-maintainer" href="{{ path('remove_maintainer', {'name': package.name}) }}"><i class="glyphicon glyphicon-remove"></i></a>{% endif %}
-                                {% if is_granted('transfer_package', package) %}<a title="Transfer Package" id="transfer-package" href="{{ path('transfer_package', {'name': package.name}) }}"><i class="glyphicon glyphicon-transfer"></i></a>{% endif %}
+                                {% if is_granted('add_maintainer', package) %}<a title="Add Maintainer" id="add-maintainer"><i class="glyphicon glyphicon-plus"></i></a>{% endif %}
+                                {% if is_granted('remove_maintainer', package) %}<a title="Remove Maintainer" id="remove-maintainer"><i class="glyphicon glyphicon-remove"></i></a>{% endif %}
+                                {% if is_granted('transfer_package', package) %}<a title="Transfer Package" id="transfer-package"><i class="glyphicon glyphicon-transfer"></i></a>{% endif %}
                             {% endif %}
 
                             <h5>Details</h5>