瀏覽代碼

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

Thomas Rabaix 11 年之前
父節點
當前提交
bd3b1d89ea
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      Controller/HelperController.php
  2. 1 1
      Resources/views/Helper/short-object-description.html.twig

+ 2 - 2
Controller/HelperController.php

@@ -180,8 +180,8 @@ class HelperController
 
         $object = $admin->getObject($objectId);
 
-        if (!$object) {
-            throw new NotFoundHttpException();
+        if (!$object && 'html' == $request->get('_format')) {
+            return new Response();
         }
 
         if ('json' == $request->get('_format')) {

+ 1 - 1
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 }}