Hide related entities if empty mootensai#132

drew1two · Mar 8, 2020 · 72bfe71 · 72bfe71
1 parent a80d9c7
commit 72bfe71
Showing 1 changed file with 22 additions and 17 deletions.
diff --git a/crud/default/views/_expand.php b/crud/default/views/_expand.php
@@ -20,28 +20,33 @@
         'content' => $this->render('_detail', [
             'model' => $model,
         ]),
-    ],
+    ]
+];
 <?php foreach ($relations as $name => $rel): ?>
     <?php if ($rel[2] && isset($rel[3]) && !in_array($name, $generator->skippedRelations)): ?>
-    [
-        'label' => '<i class="glyphicon glyphicon-book"></i> '. Html::encode(<?= $generator->generateString(Inflector::camel2words($rel[1])) ?>),
-        'options' => ['id' => "tab_<?= $rel[1] ?>_{$model-><?= $pk ?>}"],
-        'content' => $this->render('_data<?= $rel[1] ?>', [
-            'model' => $model,
-            'row' => $model-><?= $name ?>,
-        ]),
-    ],
+        if (!empty($model-><?= $name ?>)) {
+            $items[] =
+            [
+                'label' => '<i class="glyphicon glyphicon-book"></i> '. Html::encode(<?= $generator->generateString(Inflector::camel2words($rel[1])) ?>),
+                'options' => ['id' => "tab_<?= $rel[1] ?>_{$model-><?= $pk ?>}"],
+                'content' => $this->render('_data<?= $rel[1] ?>', [
+                    'model' => $model,
+                    'row' => $model-><?= $name ?>,
+                ]),
+            ];
+        }
     <?php elseif(isset($rel[$generator::REL_IS_MASTER]) && !$rel[$generator::REL_IS_MASTER]): ?>
-    [
-        'label' => '<i class="glyphicon glyphicon-book"></i> '. Html::encode(<?= $generator->generateString(Inflector::camel2words($rel[1])) ?>),
-        'options' => ['id' => "tab_<?= $rel[1] ?>_{$model-><?= $pk ?>}"],
-        'content' => $this->render('_data<?= $rel[1] ?>', [
-        'model' => $model-><?= $name ?>
-        ]),
-    ],
+        $items[] =
+        [
+            'label' => '<i class="glyphicon glyphicon-book"></i> '. Html::encode(<?= $generator->generateString(Inflector::camel2words($rel[1])) ?>),
+            'options' => ['id' => "tab_<?= $rel[1] ?>_{$model-><?= $pk ?>}"],
+            'content' => $this->render('_data<?= $rel[1] ?>', [
+            'model' => $model-><?= $name ?>
+            ]),
+        ];
     <?php endif; ?>
 <?php endforeach; ?>
-];
+
 echo TabsX::widget([
     'items' => $items,
     'position' => TabsX::POS_ABOVE,