Merge branch 'master' of git://github.com/c2is/BigfootCoreBundle

c2is · Jan 21, 2014 · d31de61 · d31de61
2 parents c84339b + 1e34362
commit d31de61
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Crud/CrudController.php b/Crud/CrudController.php
@@ -214,7 +214,7 @@ protected function doIndex()
                 ),
             ),
             'actions'           => array(
-                array(
+                'edit' => array(
                     'href'  => $this->container->get('router')->generate($this->getRouteNameForAction('edit'), array('id' => '__ID__')),
                     'icon'  => 'pencil',
                 )

diff --git a/Resources/views/base.list.html.twig b/Resources/views/base.list.html.twig
@@ -21,7 +21,9 @@
                     {% for attr, field in list_fields %}
                         <th>{{ field | trans }}</th>
                     {% endfor %}
+                    {% if actions|length > 0 %}
                     <th>Actions</th>
+                    {% endif %}
                 </tr>
                 </thead>
                 <tbody>
@@ -31,11 +33,15 @@
                             <td>{{ attribute(item, attr)|nl2br }}</td>
                         {% endfor %}
                         {% block action_buttons %}
+                        {% if actions|length > 0 %}
                         <td>
                             <div class="btn-group">
-                                <a class="btn btn-link" href="{{ path(list_edit_route, { 'id': item.id }) }}"><span class="glyphicon glyphicon-pencil"></span></a>
+                                {% for action in actions %}
+                                <a class="btn btn-link" href="{{ action.href|replace({'__ID__': item.id}) }}"><span class="glyphicon glyphicon-{{ action.icon }}"></span></a>
+                                {% endfor %}
                             </div>
                         </td>
+                        {% endif %}
                         {% endblock %}
                     </tr>
                 {% endfor %}