fix ui issue when deleting a one-to-X element

rccc · Jan 7, 2014 · bd3b1d8 · bd3b1d8
1 parent 18ae1b5
commit bd3b1d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Controller/HelperController.php b/Controller/HelperController.php
@@ -180,8 +180,8 @@ public function getShortObjectDescriptionAction(Request $request)
 
         $object = $admin->getObject($objectId);
 
-        if (!$object) {
-            throw new NotFoundHttpException();
+        if (!$object && 'html' == $request->get('_format')) {
+            return new Response();
         }
 
         if ('json' == $request->get('_format')) {

diff --git a/Resources/views/Helper/short-object-description.html.twig b/Resources/views/Helper/short-object-description.html.twig
@@ -1,5 +1,5 @@
 <span class="inner-field-short-description">
-    {% if admin.hasRoute('edit') and admin.isGranted('EDIT') %}
+    {% if object and admin.hasRoute('edit') and admin.isGranted('EDIT') %}
         <a href="{{ admin.generateObjectUrl('edit', object) }}" target="new">{{ description }}</a>
     {% else %}
         {{ description }}