Skip to content

Commit

Permalink
Revert "Fix 68"
Browse files Browse the repository at this point in the history
This reverts commit 33b76c8.
  • Loading branch information
gmanen committed Jun 4, 2014
1 parent 2946595 commit b3c62f4
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 26 deletions.
13 changes: 4 additions & 9 deletions Controller/CrudController.php
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,7 @@ protected function doIndex()
Query::HINT_CUSTOM_OUTPUT_WALKER,
'Gedmo\Translatable\Query\TreeWalker\TranslationWalker'
)
// ->getResult()
;
->getResult();

return $this->renderIndex($query);
}
Expand Down Expand Up @@ -477,8 +476,8 @@ protected function addSuccessFlash($message, $route = null)
'heading' => 'Success!',
'message' => $this->getTranslator()->trans($message, array('%entity%' => $this->getEntityName())),
'actions' => $actions
)
)
)
);
}

Expand All @@ -497,16 +496,12 @@ protected function handleSuccessResponse($action, $entity = null)
*
* @param object $entity entity
*/
protected function prePersist($entity, $action)
{
}
protected function prePersist($entity, $action) {}

/**
* Post flush entity
*
* @param object $entity entity
*/
protected function postFlush($entity, $action)
{
}
protected function postFlush($entity, $action) {}
}
34 changes: 17 additions & 17 deletions Resources/views/base.list.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
<div class="widget-content">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
{% for attr, field in list_fields %}
<th>{{ field|trans }}</th>
{% endfor %}
{% if actions|length > 0 %}
<th>Actions</th>
{% endif %}
</tr>
<tr>
{% for attr, field in list_fields %}
<th>{{ field | trans }}</th>
{% endfor %}
{% if actions|length > 0 %}
<th>Actions</th>
{% endif %}
</tr>
</thead>
<tbody>
{% for item in list_items %}
Expand All @@ -33,15 +33,15 @@
<td>{{ attribute(item, attr)|nl2br }}</td>
{% endfor %}
{% block action_buttons %}
{% if actions|length > 0 %}
<td>
<div class="btn-group">
{% 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 %}
{% if actions|length > 0 %}
<td>
<div class="btn-group">
{% 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 %}
Expand Down

0 comments on commit b3c62f4

Please sign in to comment.