diff --git a/db/update17.4.sql b/db/update17.4.sql index ff29c01259..90c97fb5fe 100644 --- a/db/update17.4.sql +++ b/db/update17.4.sql @@ -28,4 +28,11 @@ UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource` UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource` WHERE `code`='feedbackSolution' ORDER BY `id` DESC LIMIT 1) WHERE `module`='feedback' AND `field`='solution'; UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource` WHERE `code`='feedbackclosedReason' ORDER BY `id` DESC LIMIT 1), `control`='select' WHERE `module`='feedback' AND `field`='closedReason'; -UPDATE `zt_project` SET `closedDate`='' AND `closedBy`='' WHERE `status` != 'closed'; \ No newline at end of file +UPDATE `zt_project` SET `closedDate`='' AND `closedBy`='' WHERE `status` != 'closed'; +UPDATE `zt_grouppriv` SET `method`='exportTemplate' WHERE `method` = 'exportTemplet'; + +INSERT IGNORE INTO `zt_workflowaction` (`module`, `action`, `method`, `name`, `type`, `batchMode`, `extensionType`, `open`, `position`, `layout`, `show`, `buildin`, `role`, `createdBy`, `createdDate`) VALUES +('bug', 'batchactivate', 'batchoperate', '批量激活', 'batch', 'different', 'none', 'normal', 'browse', 'normal', 'direct', '1', 'buildin', '', '2022-08-09 15:52'); + +INSERT INTO `zt_grouppriv` (SELECT `group`,`module`,'reply' FROM `zt_grouppriv` WHERE `module` = 'feedback' AND `method` = 'comment'); +INSERT INTO `zt_grouppriv` (SELECT `group`,`module`,'ask' FROM `zt_grouppriv` WHERE `module` = 'feedback' AND `method` = 'comment'); diff --git a/framework/control.class.php b/framework/control.class.php index b937a96342..209cf5fb76 100644 --- a/framework/control.class.php +++ b/framework/control.class.php @@ -389,27 +389,21 @@ class control extends baseControl * inForm=0|1 The fields displayed in a form or not. The default is 1. * inCell=0|1 The fields displayed in a div with class cell or not. The default is 0. * @param bool $print + * @param string $moduleName + * @param string $methodName * @access public * @return void */ - public function printExtendFields($object, $type, $extras = '', $print = true) + public function printExtendFields($object, $type, $extras = '', $print = true, $moduleName = '', $methodName = '') { if(!isset($this->config->bizVersion)) return false; - $moduleName = $this->app->getModuleName(); - $methodName = $this->app->getMethodName(); + $moduleName = $moduleName ? $moduleName : $this->app->getModuleName(); + $methodName = $methodName ? $methodName : $this->app->getMethodName(); $fields = $this->loadModel('flow')->printFields($moduleName, $methodName, $object, $type, $extras); if(!$print) return $fields; - $picker = ''; - //$jsRoot = $this->config->webRoot . "js/"; - //$picker = file_get_contents($this->app->getBasePath() . 'app/sys/common/view/picker.html.php'); - //$picker = substr($picker, strpos($picker, '"; +} +?> +