Refactory vistas y actions

Controller/AuditController.php

@@ -75,22 +75,24 @@ class AuditController extends Controller
      * 
      * @return string
      * 
-     * @Route("/admin/audit/view/{className}/{id}/{rev}", name="entity_audit_view_details")
+     * @Route("/admin/audit/view/{classValue}/{id}/{rev}", name="entity_audit_view_details")
      */
-    public function viewAction(Request $request, $className, $id, $rev)
+    public function viewAction(Request $request, $classValue, $id, $rev)
     {
         /* @var $auditDataService AuditDataService */
         $auditDataService = $this->get('audit.audit_data.service');
+        $className = array_search($classValue, $auditDataService->getEntities());
         $result = $auditDataService->viewRevision($className, $id, $rev);
 
         $data = array(
             'label' => $this->get('translator')->trans('Detalles de la revisión: %rev%', array('%rev%' => $rev), 'AuditBundle'),
             'className' => $className,
+            'classValue' => $classValue,
             'id' => $id,
             'rev' => $rev,
             'revdata' => $result['revdata'],
             'details' => $result['rev_details'],
-            'revisions' => $result['rev_revisions']
+            'revisions' => $result['rev_revisions'],
         );
 
         return $this->render('AuditBundle:Audit:view.html.twig', array(
@@ -109,9 +111,9 @@ class AuditController extends Controller
      * 
      * @return string
      * 
-     * @Route("/admin/flowdat2/entity/audit/compare/{className}/{id}", name="entity_audit_compare_revs")
+     * @Route("/admin/flowdat2/entity/audit/compare/{classValue}/{id}", name="entity_audit_compare_revs")
      */
-    public function compareAction(Request $request, $className, $id, $oldRev = null, $newRev = null)
+    public function compareAction(Request $request, $classValue, $id, $oldRev = null, $newRev = null)
     {
         try {
             $oldRev = $request->query->get('oldRev');
@@ -119,11 +121,13 @@ class AuditController extends Controller
 
             /* @var $auditDataService AuditDataService */
             $auditDataService = $this->get('audit.audit_data.service');
+            $className = array_search($classValue, $auditDataService->getEntities());
             $diff = $auditDataService->diff($className, $id, $oldRev, $newRev);
 
             $data = array(
                 'label' => $this->get('translator')->trans('Comparativa entre las revisiones %oldRev% y %newRev%', array('%oldRev%' => $oldRev, '%newRev%' => $newRev), 'AuditBundle'),
                 'className' => $className,
+                'classValue' => $classValue,
                 'id' => $id,
                 'oldRev' => $oldRev,
                 'newRev' => $newRev,

Resources/views/Audit/compare.html.twig

@@ -41,8 +41,8 @@
                         <tr class="filter inactive">
                             <td class="filter-title" width="180"><b>{{ 'Campo'|trans({}, 'AuditBundle') }}</b></td>
                             <td class="filter-title"><b>{{ 'Sin cambios'|trans({}, 'AuditBundle') }}</b></td>
-                            <td class="filter-title"><b>{{ 'Anterior'|trans({}, 'AuditBundle') }} (Rev: <a href="{{ path('entity_audit_view_details', { 'className': data.className, 'id': data.id, 'rev': data.oldRev }) }}">{{ data.oldRev }}</a>)</b></td>
-                            <td class="filter-title"><b>{{ 'Actual'|trans({}, 'AuditBundle') }} (Rev: <a href="{{ path('entity_audit_view_details', { 'className': data.className, 'id': data.id, 'rev': data.newRev }) }}">{{ data.newRev }}</a>)</b></td>
+                            <td class="filter-title"><b>{{ 'Anterior'|trans({}, 'AuditBundle') }} (Rev: <a href="{{ path('entity_audit_view_details', { 'classValue': data.classValue, 'id': data.id, 'rev': data.oldRev }) }}">{{ data.oldRev }}</a>)</b></td>
+                            <td class="filter-title"><b>{{ 'Actual'|trans({}, 'AuditBundle') }} (Rev: <a href="{{ path('entity_audit_view_details', { 'classValue': data.classValue, 'id': data.id, 'rev': data.newRev }) }}">{{ data.newRev }}</a>)</b></td>
                         </tr>
                     </tbody>
                     <tbody>
@@ -82,7 +82,7 @@
                 </table>
                 <div style="width: 100%; min-height: 64px; background-color: #ffffff;">
                     <div style="float: right; padding: 15px;">
-                        <a class="btn btn-small btn-primary" href="{{ path('entity_audit') }}">{{ 'Regresar'|trans({}, 'AuditBundle') }}</a>
+                        <a class="btn btn-small btn-default" href="{{ path('entity_audit_view_details', { 'classValue': data.classValue, 'id': data.id, 'rev': data.newRev }) }}">{{ 'Regresar'|trans({}, 'AuditBundle') }}</a>
                     </div>
                 </div>
             </div>

Resources/views/Audit/index.html.twig

@@ -162,7 +162,7 @@
                         <tbody>
                             {% for item in data %}
                                 <tr>
-                                    <td><a href="{{ path('entity_audit_view_details', { 'className': entity, 'id':item['id'], 'rev':item['rev'] }) }}">{{ item['rev'] }}</a></td>
+                                    <td><a href="{{ path('entity_audit_view_details', { 'classValue': entities[entity], 'id':item['id'], 'rev':item['rev'] }) }}">{{ item['rev'] }}</a></td>
                                     <td>{{ item['id'] }}</td>
                                     <td>{{ item['revtype'] }}</td>
                                     <td>{{ item['username'] }}</td>
@@ -171,7 +171,7 @@
                                         <ul>
                                             {% for column in columns[entity] %}
                                                 <li style="float: left; width: 23%; margin-right: 2%; line-height: 1 !important"><strong>{{ column }}:</strong> {{ item[column] }}</li>
-                                                {% endfor %}
+                                            {% endfor %}
                                         </ul>
                                     </td>
                                 </tr>

Resources/views/Audit/view.html.twig

@@ -83,7 +83,7 @@
                 <div class="box-header">
                     <h4 class="box-title"> {{ 'Revisiones efectuadas'|trans({}, 'AuditBundle') }} ({{ data.revisions|length }}): </h4>
                 </div>
-                <form action="{{ path('entity_audit_compare_revs', { 'className': data.className, 'id': data.id }) }}" method="get">
+                <form action="{{ path('entity_audit_compare_revs', { 'classValue': data.classValue, 'id': data.id }) }}" method="get">
                     <div style="display:block; height:200px; overflow:auto;">
                         <table class="table table-bordered table-striped sonata-ba-list" style="width:100%; margin-top:0px; margin-bottom:0px">
                             <tbody>
@@ -99,7 +99,7 @@
                                 {% for revision in data.revisions %}
                                     <tr class="filter inactive">
                                         <td class="filter-value" style="text-align:center;">
-                                            <a href="{{ path('entity_audit_view_details', { 'className': data.className, 'id': data.id, 'rev': revision.rev }) }}">{{ revision.rev }}</a>
+                                            <a href="{{ path('entity_audit_view_details', { 'classValue': data.classValue, 'id': data.id, 'rev': revision.rev }) }}">{{ revision.rev }}</a>
                                         </td>
                                         <td class="filter-value">{{ revision.timestamp | date("d/m/Y \\a \\l\\a\\s h:m:s") }}</td>
                                         <td class="filter-value">{{ revision.username|default('(anonymous)') }}</td>