Refactor the show action, rename view => show, fix bug and missing im…

…plementation
youbs · Aug 3, 2011 · 6b2e10a · 6b2e10a
1 parent 2753079
commit 6b2e10a
Show file tree

Hide file tree

Showing 23 changed files with 205 additions and 295 deletions.
diff --git a/Admin/Admin.php b/Admin/Admin.php
diff --git a/Admin/AdminInterface.php b/Admin/AdminInterface.php
@@ -109,11 +109,9 @@ function getModelManager();
 
     /**
      *
-     * @param mixed $object
-     * @param array $options
      * @return \Symfony\Component\Form\FormBuilder the form builder
      */
-    function getFormBuilder($object = null, $options = array());
+    function getFormBuilder();
 
     /**
      * @abstract

diff --git a/Admin/FieldDescriptionCollection.php b/Admin/FieldDescriptionCollection.php
@@ -12,7 +12,7 @@
 
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
 
-class FieldDescriptionCollection
+class FieldDescriptionCollection implements \ArrayAccess, \Countable
 {
     protected $elements = array();
 
@@ -66,4 +66,29 @@ public function remove($name)
             unset($this->elements[$name]);
         }
     }
+
+    public function offsetExists($offset)
+    {
+        return $this->has($offset);
+    }
+
+    public function offsetGet($offset)
+    {
+        return $this->get($offset);
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        throw new \RunTimeException('Cannot set value, use add');
+    }
+
+    public function offsetUnset($offset)
+    {
+        $this->remove($offset);
+    }
+
+    public function count()
+    {
+        return count($this->elements);
+    }
 }
diff --git a/Builder/ORM/DatagridBuilder.php b/Builder/ORM/DatagridBuilder.php
@@ -25,7 +25,6 @@
 
 class DatagridBuilder implements DatagridBuilderInterface
 {
-
     protected $formFactory;
 
     /**
@@ -169,7 +168,7 @@ public function addFilter(DatagridInterface $datagrid, FieldDescriptionInterface
             return false;
         }
 
-        switch($fieldDescription->getType()) {
+        switch($fieldDescription->getMappingType()) {
             case ClassMetadataInfo::MANY_TO_ONE:
                 $options = $fieldDescription->getOption('filter_field_options');
                 $filter = new \Sonata\AdminBundle\Filter\ORM\IntegerFilter($fieldDescription);
@@ -180,6 +179,7 @@ public function addFilter(DatagridInterface $datagrid, FieldDescriptionInterface
                 $options = $fieldDescription->getOption('filter_field_options');
                 $options['choices'] = $this->getChoices($fieldDescription);
 
+
                 $fieldDescription->setOption('filter_field_options', $options);
 
                 $filter = new \Sonata\AdminBundle\Filter\ORM\ChoiceFilter($fieldDescription);

diff --git a/Builder/ORM/FormContractor.php b/Builder/ORM/FormContractor.php
@@ -46,6 +46,8 @@ protected function getOneToOneFieldOptions($type, FieldDescriptionInterface $fie
     {
         $options = array();
 
+        $options['data_class']    = $fieldDescription->getTargetEntity();
+
         if (!$fieldDescription->hasAssociationAdmin()) {
             return $options;
         }
@@ -65,7 +67,6 @@ protected function getOneToOneFieldOptions($type, FieldDescriptionInterface $fie
         }
 
         $options['class']         = $fieldDescription->getTargetEntity();
-        $options['data_class']    = $fieldDescription->getTargetEntity();
         $options['model_manager'] = $fieldDescription->getAdmin()->getModelManager();
 
         if ($fieldDescription->getOption('edit') == 'list') {

diff --git a/Builder/ORM/ViewBuilder.php → Builder/ORM/ShowBuilder.php b/Builder/ORM/ViewBuilder.php → Builder/ORM/ShowBuilder.php
@@ -15,11 +15,11 @@
 use Sonata\AdminBundle\Model\ModelManagerInterface;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\FieldDescriptionCollection;
-use Sonata\AdminBundle\Builder\ViewBuilderInterface;
+use Sonata\AdminBundle\Builder\ShowBuilderInterface;
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-class ViewBuilder implements ViewBuilderInterface
+class ShowBuilder implements ShowBuilderInterface
 {
     public function getBaseList(array $options = array())
     {
@@ -28,7 +28,21 @@ public function getBaseList(array $options = array())
 
     public function addField(FieldDescriptionCollection $list, FieldDescriptionInterface $fieldDescription)
     {
-        return $list->add($fieldDescription);
+        if (!$fieldDescription->getType()) {
+            return false;
+        }
+
+        switch($fieldDescription->getMappingType()) {
+            case ClassMetadataInfo::MANY_TO_ONE:
+            case ClassMetadataInfo::MANY_TO_MANY:
+            case ClassMetadataInfo::ONE_TO_MANY:
+            case ClassMetadataInfo::ONE_TO_ONE:
+                // todo
+                return;
+            default:
+                $list->add($fieldDescription);
+        }
+
     }
 
     /**
@@ -67,22 +81,22 @@ public function fixFieldDescription(AdminInterface $admin, FieldDescriptionInter
 
         if (!$fieldDescription->getTemplate()) {
 
-            $fieldDescription->setTemplate(sprintf('SonataAdminBundle:CRUD:view_%s.html.twig', $fieldDescription->getType()));
+            $fieldDescription->setTemplate(sprintf('SonataAdminBundle:CRUD:show_%s.html.twig', $fieldDescription->getType()));
 
             if ($fieldDescription->getType() == ClassMetadataInfo::MANY_TO_ONE) {
-                $fieldDescription->setTemplate('SonataAdminBundle:CRUD:view_orm_many_to_one.html.twig');
+                $fieldDescription->setTemplate('SonataAdminBundle:CRUD:show_orm_many_to_one.html.twig');
             }
 
             if ($fieldDescription->getType() == ClassMetadataInfo::ONE_TO_ONE) {
-                $fieldDescription->setTemplate('SonataAdminBundle:CRUD:view_orm_one_to_one.html.twig');
+                $fieldDescription->setTemplate('SonataAdminBundle:CRUD:show_orm_one_to_one.html.twig');
             }
 
             if ($fieldDescription->getType() == ClassMetadataInfo::ONE_TO_MANY) {
-                $fieldDescription->setTemplate('SonataAdminBundle:CRUD:view_orm_one_to_many.html.twig');
+                $fieldDescription->setTemplate('SonataAdminBundle:CRUD:show_orm_one_to_many.html.twig');
             }
 
             if ($fieldDescription->getType() == ClassMetadataInfo::MANY_TO_MANY) {
-                $fieldDescription->setTemplate('SonataAdminBundle:CRUD:view_orm_many_to_many.html.twig');
+                $fieldDescription->setTemplate('SonataAdminBundle:CRUD:show_orm_many_to_many.html.twig');
             }
         }
 

diff --git a/Builder/ViewBuilderInterface.php → Builder/ShowBuilderInterface.php b/Builder/ViewBuilderInterface.php → Builder/ShowBuilderInterface.php
@@ -16,7 +16,7 @@
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\FieldDescriptionCollection;
 
-interface ViewBuilderInterface
+interface ShowBuilderInterface
 {
     /**
      * @abstract

diff --git a/Controller/CRUDController.php b/Controller/CRUDController.php
@@ -191,7 +191,8 @@ public function editAction($id)
 
         $this->admin->setSubject($object);
 
-        $form = $this->admin->getForm($object);
+        $form = $this->admin->getForm();
+        $form->setData($object);
 
         if ($this->get('request')->getMethod() == 'POST') {
             $form->bindRequest($this->get('request'));
@@ -345,9 +346,9 @@ public function createAction()
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function viewAction($id)
+    public function showAction($id)
     {
-        if (false === $this->admin->isGranted('VIEW')) {
+        if (false === $this->admin->isGranted('SHOW')) {
             throw new AccessDeniedException();
         }
 
@@ -359,9 +360,13 @@ public function viewAction($id)
 
         $this->admin->setSubject($object);
 
-        return $this->render($this->admin->getViewTemplate(), array(
-            'action'         => 'view',
+        // build the show list
+        $elements = $this->admin->getShow();
+
+        return $this->render($this->admin->getShowTemplate(), array(
+            'action'         => 'show',
             'object'         => $object,
+            'elements'       => $this->admin->getShow(),
             'admin'          => $this->admin,
             'base_template'  => $this->getBaseTemplate(),
         ));

diff --git a/Datagrid/DatagridMapper.php b/Datagrid/DatagridMapper.php
@@ -48,6 +48,7 @@ public function add($name, array $fieldDescriptionOptions = array())
             $fieldDescription->mergeOptions($fieldDescriptionOptions);
 
         } else if (is_string($name) && !$this->admin->hasFormFieldDescription($name)) {
+
             $fieldDescription = $this->admin->getModelManager()->getNewFieldDescriptionInstance(
                 $this->admin->getClass(),
                 $name,

diff --git a/DependencyInjection/AddDependencyCallsCompilerPass.php b/DependencyInjection/AddDependencyCallsCompilerPass.php
@@ -100,8 +100,8 @@ public function applyDefaults(Definition $definition, array $attributes = array(
             $definition->addMethodCall('setFormContractor', array(new Reference(sprintf('sonata.admin.builder.%s_form', $manager_type))));
         }
 
-        if (!$definition->hasMethodCall('setViewBuilder')) {
-            $definition->addMethodCall('setViewBuilder', array(new Reference(sprintf('sonata.admin.builder.%s_view', $manager_type))));
+        if (!$definition->hasMethodCall('setShowBuilder')) {
+            $definition->addMethodCall('setShowBuilder', array(new Reference(sprintf('sonata.admin.builder.%s_show', $manager_type))));
         }
 
         if (!$definition->hasMethodCall('setListBuilder')) {

diff --git a/Resources/config/doctrine_orm.xml b/Resources/config/doctrine_orm.xml
@@ -16,12 +16,11 @@
 
         <service id="sonata.admin.builder.orm_list" class="Sonata\AdminBundle\Builder\ORM\ListBuilder" />
 
-        <service id="sonata.admin.builder.orm_view" class="Sonata\AdminBundle\Builder\ORM\ViewBuilder" />
+        <service id="sonata.admin.builder.orm_show" class="Sonata\AdminBundle\Builder\ORM\ShowBuilder" />
 
         <service id="sonata.admin.builder.orm_datagrid" class="Sonata\AdminBundle\Builder\ORM\DatagridBuilder">
             <argument type="service" id="form.factory" />
         </service>
 
     </services>
-
 </container>
diff --git a/Resources/views/CRUD/base_edit.html.twig b/Resources/views/CRUD/base_edit.html.twig
@@ -14,8 +14,8 @@ file that was distributed with this source code.
 {% block actions %}
     <div class="sonata-actions">
         <ul>
-            {% if admin.id(object) and admin.isGranted('VIEW') and admin.getViewFieldDescriptions is not empty %}
-                <li class="sonata-action-element"><a href="{{ admin.generateUrl('view', {'id' : admin.id(object)}) }}">{% trans from 'SonataAdminBundle' %}link_action_view{% endtrans %}</a></li>
+            {% if admin.id(object) and admin.isGranted('VIEW') and admin.show|length > 0 %}
+                <li class="sonata-action-element"><a href="{{ admin.generateUrl('show', {'id' : admin.id(object)}) }}">{% trans from 'SonataAdminBundle' %}link_action_show{% endtrans %}</a></li>
             {% endif %}
             {% if admin.isGranted('CREATE')%}
                 <li class="sonata-action-element"><a href="{{ admin.generateUrl('create') }}">{% trans from 'SonataAdminBundle' %}link_action_create{% endtrans %}</a></li>
@@ -58,13 +58,9 @@ file that was distributed with this source code.
                     <div class="sonata-ba-collapsed-fields">
             {% endif %}
 
-
             {% for field_name in form_group.fields %}
                 {% if admin.formfielddescriptions[field_name] is defined %}
-                    {#{{ admin.formfielddescriptions[field_name]|render_form_element(form, object) }}#}
-
                     {{ form_row(form[field_name])}}
-
                 {% endif %}
             {% endfor %}
 

diff --git a/Resources/views/CRUD/base_list_field.html.twig b/Resources/views/CRUD/base_list_field.html.twig
@@ -10,12 +10,12 @@ file that was distributed with this source code.
 #}
 
 <td class="sonata-ba-list-field sonata-ba-list-field-{{ field_description.type }}" objectId="{{ admin.id(object) }}">
-    {% if field_description.options.identifier is defined and admin.isGranted(['EDIT', 'VIEW']) %}
+    {% if field_description.options.identifier is defined and admin.isGranted(['EDIT', 'SHOW']) %}
 
         {% if admin.isGranted('EDIT') %}
             <a href="{{ admin.generateUrl('edit', {'id': admin.id(object)}) }}">
         {% else %}
-            <a href="{{ admin.generateUrl('view', {'id': admin.id(object)}) }}">
+            <a href="{{ admin.generateUrl('show', {'id': admin.id(object)}) }}">
         {% endif %}
 
             {% block field %}{{ value }}{% endblock %}

diff --git a/Resources/views/CRUD/base_view.html.twig → Resources/views/CRUD/base_show.html.twig b/Resources/views/CRUD/base_view.html.twig → Resources/views/CRUD/base_show.html.twig
@@ -27,7 +27,7 @@ file that was distributed with this source code.
 
 {% block side_menu %}{{ admin.sidemenu(action).render|raw }}{% endblock %}
 
-{% block view %}
+{% block show %}
     <div class="sonata-ba-view">
         {% for name, view_group in admin.viewgroups %}
             <table>
@@ -41,8 +41,8 @@ file that was distributed with this source code.
 
                 {% for field_name in view_group.fields %}
                     <tr class="sonata-ba-view-container">
-                        {% if admin.viewfielddescriptions[field_name] is defined %}
-                            {{ admin.viewfielddescriptions[field_name]|render_view_element(object) }}
+                        {% if admin.show[field_name] is defined %}
+                            {{ admin.show[field_name]|render_view_element(object) }}
                         {% endif %}
                     </tr>
                 {% endfor %}

diff --git a/...rces/views/CRUD/base_view_field.html.twig → ...rces/views/CRUD/base_show_field.html.twig b/...rces/views/CRUD/base_view_field.html.twig → ...rces/views/CRUD/base_show_field.html.twig
diff --git a/Resources/views/CRUD/list.html.twig b/Resources/views/CRUD/list.html.twig
@@ -9,4 +9,4 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'SonataAdminBundle:CRUD:base_list.html.twig' %}
+{% extends 'SonataAdminBundle:CRUD:base_list.html.twig' %}
diff --git a/Resources/views/CRUD/view.html.twig → Resources/views/CRUD/show.html.twig b/Resources/views/CRUD/view.html.twig → Resources/views/CRUD/show.html.twig
@@ -9,5 +9,5 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'SonataAdminBundle:CRUD:base_view.html.twig' %}
+{% extends 'SonataAdminBundle:CRUD:base_show.html.twig' %}
 
diff --git a/Resources/views/CRUD/view_date.html.twig → Resources/views/CRUD/show_date.html.twig b/Resources/views/CRUD/view_date.html.twig → Resources/views/CRUD/show_date.html.twig
@@ -9,6 +9,6 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'SonataAdminBundle:CRUD:base_view_field.html.twig' %}
+{% extends 'SonataAdminBundle:CRUD:base_show_field.html.twig' %}
 
 {% block value %}{{ value|date('F j, Y') }}{% endblock %}
diff --git a/Resources/views/CRUD/view_datetime.html.twig → Resources/views/CRUD/show_datetime.html.twig b/Resources/views/CRUD/view_datetime.html.twig → Resources/views/CRUD/show_datetime.html.twig
@@ -9,7 +9,7 @@ file that was distributed with this source code.
 
 #}
 
-{% extends 'SonataAdminBundle:CRUD:base_view_field.html.twig' %}
+{% extends 'SonataAdminBundle:CRUD:base_show_field.html.twig' %}
 
 {% block value %}{{ value|date }}{% endblock %}
 
diff --git a/Resources/views/standard_layout.html.twig b/Resources/views/standard_layout.html.twig
@@ -55,7 +55,7 @@ file that was distributed with this source code.
         {# initialize block value #}
         {% set preview      = block('preview') %}
         {% set form         = block('form') %}
-        {% set view         = block('view') %}
+        {% set show         = block('show') %}
         {% set list_table   = block('list_table') %}
         {% set list_filters = block('list_filters') %}
         {% set side_menu    = block('side_menu') %}
@@ -126,8 +126,8 @@ file that was distributed with this source code.
                         <div class="sonata-ba-content">{{ content|raw }}</div>
                     {% endif %}
 
-                    {% if view is not empty %}
-                        <div class="sonata-ba-view">{{ view|raw }}</div>
+                    {% if show is not empty %}
+                        <div class="sonata-ba-show">{{ show|raw }}</div>
                     {% endif %}
 
                     {% if form is not empty %}

diff --git a/Security/Acl/Permission/AdminPermissionMap.php b/Security/Acl/Permission/AdminPermissionMap.php
@@ -22,7 +22,7 @@
  */
 class AdminPermissionMap implements PermissionMapInterface
 {
-    const PERMISSION_VIEW        = 'VIEW';
+    const PERMISSION_SHOW        = 'SHOW';
     const PERMISSION_EDIT        = 'EDIT';
     const PERMISSION_CREATE      = 'CREATE';
     const PERMISSION_DELETE      = 'DELETE';
@@ -38,7 +38,7 @@ class AdminPermissionMap implements PermissionMapInterface
             MaskBuilder::MASK_LIST
         ),
 
-        self::PERMISSION_VIEW => array(
+        self::PERMISSION_SHOW => array(
             MaskBuilder::MASK_VIEW,
         ),
 

diff --git a/Show/ShowMapper.php b/Show/ShowMapper.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  *
  */
-namespace Sonata\AdminBundle\Datagrid;
+namespace Sonata\AdminBundle\Show;
 
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\FieldDescriptionInterface;
@@ -48,7 +48,7 @@ public function add($name, array $fieldDescriptionOptions = array())
             $fieldDescription = $name;
             $fieldDescription->mergeOptions($fieldDescriptionOptions);
 
-        } else if (is_string($name) && !$this->admin->hasListFieldDescription($name)) {
+        } else if (is_string($name) && !$this->admin->hasShowFieldDescription($name)) {
 
             $fieldDescription = $this->admin->getModelManager()->getNewFieldDescriptionInstance(
                 $this->admin->getClass(),
@@ -57,7 +57,7 @@ public function add($name, array $fieldDescriptionOptions = array())
             );
 
             $this->showBuilder->fixFieldDescription($this->admin, $fieldDescription, $fieldDescriptionOptions);
-            $this->admin->addListFieldDescription($name, $fieldDescription);
+            $this->admin->addShowFieldDescription($name, $fieldDescription);
 
         } else if (is_string($name) && $this->admin->hasShowFieldDescription($name)) {
             $fieldDescription = $this->admin->getShowFieldDescription($name);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@ file that was distributed with this source code.

		#}

		{% extends 'SonataAdminBundle:CRUD:base_list.html.twig' %}
		{% extends 'SonataAdminBundle:CRUD:base_list.html.twig' %}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,5 +9,5 @@ file that was distributed with this source code.

		#}

		{% extends 'SonataAdminBundle:CRUD:base_view.html.twig' %}
		{% extends 'SonataAdminBundle:CRUD:base_show.html.twig' %}