Преглед на файлове

Change ambiguous inline action "view" to "show".

Deleted list__action_view.html.twig template, added deprecated info in ListMapper.
Andrej Hudec преди 11 години
родител
ревизия
df69d94850
променени са 4 файла, в които са добавени 13 реда и са изтрити 2 реда
  1. 11 0
      Datagrid/ListMapper.php
  2. 1 1
      Resources/skeleton/Admin.php.twig
  3. 0 0
      Resources/views/CRUD/list__action_show.html.twig
  4. 1 1
      Tests/Fixtures/Admin/ModelAdmin.php

+ 11 - 0
Datagrid/ListMapper.php

@@ -68,6 +68,17 @@ class ListMapper extends BaseMapper
      */
     public function add($name, $type = null, array $fieldDescriptionOptions = array())
     {
+        //Change deprecated inline action "view" to "show"
+        if ($name == '_action' && $type == 'actions') {
+            if (isset($fieldDescriptionOptions['actions']['view'])) {
+                trigger_error('Inline action "view" is deprecated since version 2.2.4. Use inline action "show" instead.', E_USER_DEPRECATED);
+
+                $fieldDescriptionOptions['actions']['show'] = $fieldDescriptionOptions['actions']['view'];
+
+                unset($fieldDescriptionOptions['actions']['view']);
+            }
+        }
+
         if ($name instanceof FieldDescriptionInterface) {
             $fieldDescription = $name;
             $fieldDescription->mergeOptions($fieldDescriptionOptions);

+ 1 - 1
Resources/skeleton/Admin.php.twig

@@ -35,7 +35,7 @@ class {{ classBasename }} extends Admin
             {{- code }}
             ->add('_action', 'actions', array(
                 'actions' => array(
-                    'view' => array(),
+                    'show' => array(),
                     'edit' => array(),
                     'delete' => array(),
                 )

Resources/views/CRUD/list__action_view.html.twig → Resources/views/CRUD/list__action_show.html.twig


+ 1 - 1
Tests/Fixtures/Admin/ModelAdmin.php

@@ -33,7 +33,7 @@ class ModelAdmin extends Admin
             ->add('baz')
             ->add('_action', 'actions', array(
                 'actions' => array(
-                    'view' => array(),
+                    'show' => array(),
                     'edit' => array(),
                     'delete' => array(),
                 )