minor bug integrate disabled action in view

hugo082 · Jun 4, 2017 · 91ed815 · 91ed815
1 parent cb01ada
commit 91ed815
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/Core/ViewManager.php b/Core/ViewManager.php
@@ -88,8 +88,8 @@ private function loadViews(Execution $execution, Request $request, $id) {
         $this->computeMainActionView($execution);
         if ($execution->isDisplayable()) {
             foreach ($execution->getViewContainer() as $childActionID) {
-                $childAction = $execution->entityInfo->getActionWithID($childActionID, true);
-                if (!$childAction->isFullAuthorize())
+                $childAction = $execution->entityInfo->getActionWithID($childActionID, false);
+                if (!$childAction || !$childAction->isFullAuthorize())
                     continue;
                 $data = $this->actionManager->processAction($request, $childAction, $id);
                 $viewMeta = $this->getViewMetaDataForAction($childAction, true);
@@ -104,8 +104,8 @@ private function loadLinks(Execution $execution) {
             if ($linkMeta == null)
                 return;
             foreach ($linkMeta->getContainer() as $childActionID) {
-                $childAction = $execution->entityInfo->getActionWithID($childActionID, true);
-                if (!$childAction->isFullAuthorize())
+                $childAction = $execution->entityInfo->getActionWithID($childActionID, false);
+                if (!$childAction || !$childAction->isFullAuthorize())
                     continue;
                 $execution->pushLink(new Link($childAction, $execution->entityInfo));
             }

diff --git a/Resources/views/Manage/form.html.twig b/Resources/views/Manage/form.html.twig
@@ -4,7 +4,6 @@
 
 <h2>form view</h2>
 
-
 <h3>{{ (eInfo.name~'.'~action.id)|trans }} :</h3>
 {{ form_start(data.form) }}
         {% for row in data.form %}

diff --git a/Resources/views/Manage/list.html.twig b/Resources/views/Manage/list.html.twig
@@ -3,20 +3,22 @@
 <h3>{{ 'entity.listing'|trans }} :</h3>
 {% if data.all is not empty %}
     <table>
+
         <tr>
-            {% for name in data.all.0.obj.properties %}
-                <th>{{ name }}</th>
+            {% for name in data.all.0.annotation_container.annotations %}
+                <th>{{ name.title }}</th>
             {% endfor %}
         </tr>
+
         {% for e in data.all %}
             <tr>
-                {% for item in e.obj.vars %}
-                    <td>{{ item }}</td>
+                {% for item in e.annotation_container.annotations %}
+                    <td>{{ item.value }}</td>
                 {% endfor %}
 
                 {% for action in eInfo.actions %}
                     {% if e.permissions[action.id] and action.environment == constant('FQT\\DBCoreManagerBundle\\DependencyInjection\\Configuration::ENV_OBJECT') %}
-                        <td><a href="{{ path('db.manager.process', {'actionID':action.id,'name':name,'id':e.obj.id})}}">{{ action.fullName }}</a></td>
+                        <td><a href="{{ path('db.manager.process', {'actionID':action.id,'name':name,'id':e.annotation_container.objectId})}}">{{ action.fullName }}</a></td>
                     {% endif %}
                 {% endfor %}
             </tr>