diff --git a/framework/control.class.php b/framework/control.class.php index 2adfdf52bb..ab559ef215 100644 --- a/framework/control.class.php +++ b/framework/control.class.php @@ -482,9 +482,22 @@ class control extends baseControl $moduleName = $moduleName ?: $this->app->getModuleName(); $methodName = $methodName ?: $this->app->getMethodName(); - $fields = $this->loadModel('flow')->printFields($moduleName, $methodName, $object, $type, $extras); - if(!$print) return $fields; + $this->loadModel('flow'); + if($type == 'html') + { + parse_str($extras, $result); + $fields = $this->flow->buildExtendHtmlValue($object, zget($result, 'position', 'info')); + } + else + { + ob_start(); + $this->flow->printFields($moduleName, $methodName, $object, $type, $extras); + $fields = ob_get_contents(); + ob_end_clean(); + } + + if(!$print) return $fields; echo $fields; } diff --git a/lib/zin/wg/detail/v1.php b/lib/zin/wg/detail/v1.php index 225cfee523..5e69071883 100644 --- a/lib/zin/wg/detail/v1.php +++ b/lib/zin/wg/detail/v1.php @@ -111,7 +111,7 @@ class detail extends wg .detail-side .tabs {padding: 12px 8px 12px 16px} .detail-side .tabs-header {position: sticky; top: 0; background: var(--color-surface-light);} .detail-side .tab-pane {padding: 0} - CSS; +CSS; } protected function created() @@ -274,9 +274,11 @@ class detail extends wg protected function buildMainSections() { + global $app; $sections = $this->prop('sections'); - $list = array(); + if($this->config->edition != 'open') $sections = $app->control->loadModel('flow')->buildExtendZinValue($sections, $this->prop('object'), 'info'); + $list = array(); foreach($sections as $key => $item) { if($item === '-') @@ -390,7 +392,9 @@ class detail extends wg protected function buildTabsList() { + global $app; $tabs = $this->prop('tabs'); + if($this->config->edition != 'open') $tabs = $app->control->loadModel('flow')->buildExtendZinValue($tabs, $this->prop('object'), 'basic'); if(!$tabs) return null; $groups = array();