Merge pull request #3624 from izica/visible-in-show-closure

tabacitu · web-flow · commit 8698b8ed51e8 · 2021-09-16T14:37:48.000+03:00
visibleInShow closure
diff --git a/src/app/Http/Controllers/Operations/ShowOperation.php b/src/app/Http/Controllers/Operations/ShowOperation.php
@@ -101,8 +101,10 @@ public function show($id)
             }
 
             // remove columns that have visibleInShow set as false
-            if (isset($column['visibleInShow']) && $column['visibleInShow'] == false) {
-                $this->crud->removeColumn($column['key']);
+            if (isset($column['visibleInShow'])) {
+                if ((is_callable($column['visibleInShow']) && $column['visibleInShow']($this->data['entry']) === false) || $column['visibleInShow'] === false) {
+                    $this->crud->removeColumn($column['key']);
+                }
             }
 
             // remove the character limit on columns that take it into account

Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,10 @@ public function show($id)`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// remove columns that have visibleInShow set as false`
`104`		`- if (isset($column['visibleInShow']) && $column['visibleInShow'] == false) {`
`105`		`- $this->crud->removeColumn($column['key']);`
	`104`	`+ if (isset($column['visibleInShow'])) {`
	`105`	`+ if ((is_callable($column['visibleInShow']) && $column['visibleInShow']($this->data['entry']) === false) \|\| $column['visibleInShow'] === false) {`
	`106`	`+ $this->crud->removeColumn($column['key']);`
	`107`	`+ }`
`106`	`108`	`}`
`107`	`109`
`108`	`110`	`// remove the character limit on columns that take it into account`