Przeglądaj źródła

Added code improvements (eko comments)

NLZ13 10 lat temu
rodzic
commit
de76c767eb

+ 4 - 8
Controller/CRUDController.php

@@ -685,16 +685,12 @@ class CRUDController extends Controller
         $reader = $manager->getReader($this->admin->getClass());
 
         $revisions = $reader->findRevisions($this->admin->getClass(), $id);
-        $currentRevision = false;
-        if(count($revisions) > 0){
-            $currentRevision = $revisions[0];
-        }
 
         return $this->render($this->admin->getTemplate('history'), array(
-            'action'    => 'history',
-            'object'    => $object,
-            'revisions' => $revisions,
-            'currentRevision' => $currentRevision,
+            'action'            => 'history',
+            'object'            => $object,
+            'revisions'         => $revisions,
+            'currentRevision'   => $revisions ? current($revisions) : false,
         ));
     }
 

+ 2 - 2
Resources/views/CRUD/base_history.html.twig

@@ -33,13 +33,13 @@ file that was distributed with this source code.
             </thead>
             <tbody>
                 {% for revision in revisions %}
-                    <tr class="{% if (revision.rev == currentRevision.rev) %}current-revision{% endif %}">
+                    <tr class="{% if (currentRevision != false and revision.rev == currentRevision.rev) %}current-revision{% endif %}">
                         <td>{{ revision.rev}}</td>
                         <td>{% include admin.getTemplate('history_revision_timestamp') %}</td>
                         <td>{{ revision.username}}</td>
                         <td><a href="{{ admin.generateObjectUrl('history_view_revision', object, {'revision': revision.rev }) }}" class="revision-link" rel="{{ revision.rev }}">{{ "label_view_revision"|trans({}, 'SonataAdminBundle') }}</a></td>
                         <td>
-                            {% if (revision.rev == currentRevision.rev) %}
+                            {% if (currentRevision == false or revision.rev == currentRevision.rev) %}
                                 /
                             {% else %}
                                 <a href="{{ admin.generateObjectUrl('history_compare_revisions', object, {'base_revision': currentRevision.rev, 'compare_revision': revision.rev }) }}" class="revision-compare-link" rel="{{ revision.rev }}">{{ "label_compare_revision"|trans({}, 'SonataAdminBundle') }}</a>