From 4f7be5c494a1ed1c09383b4dac97489621855e58 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 24 Apr 2023 09:09:37 +0800 Subject: [PATCH 1/4] * Modifying SQL errors. --- db/update18.3.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/update18.3.sql b/db/update18.3.sql index 203ced934e..062c9fcc37 100644 --- a/db/update18.3.sql +++ b/db/update18.3.sql @@ -946,7 +946,7 @@ CHANGE `extra` `extra` char(30) NOT NULL DEFAULT ''; ALTER TABLE `zt_release` CHANGE `project` `project` varchar(255) NOT NULL DEFAULT '0', CHANGE `leftBugs` `leftBugs` text NULL; -CHANGE ``notify `notify` varchar(255) NOT NULL default ''; +CHANGE `notify` `notify` varchar(255) NOT NULL default ''; ALTER TABLE `zt_researchplan` CHANGE `editedBy` `editedBy` varchar(30) NOT NULL DEFAULT '', From c060a26fcd6116326db8d53066641ba44fc2631a Mon Sep 17 00:00:00 2001 From: liugang Date: Mon, 24 Apr 2023 01:44:35 +0000 Subject: [PATCH 2/4] * Fix sql error. --- db/update18.3.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/update18.3.sql b/db/update18.3.sql index 062c9fcc37..67e915554a 100644 --- a/db/update18.3.sql +++ b/db/update18.3.sql @@ -945,7 +945,7 @@ CHANGE `extra` `extra` char(30) NOT NULL DEFAULT ''; ALTER TABLE `zt_release` CHANGE `project` `project` varchar(255) NOT NULL DEFAULT '0', -CHANGE `leftBugs` `leftBugs` text NULL; +CHANGE `leftBugs` `leftBugs` text NULL, CHANGE `notify` `notify` varchar(255) NOT NULL default ''; ALTER TABLE `zt_researchplan` From 7527b808bb74a9f5e0530e68fd572f89d1eb63d0 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Mon, 24 Apr 2023 02:01:01 +0000 Subject: [PATCH 3/4] * Code for bug#34621. --- module/chart/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/chart/control.php b/module/chart/control.php index f67f1b0b30..89803baf81 100644 --- a/module/chart/control.php +++ b/module/chart/control.php @@ -181,7 +181,7 @@ class chart extends control $sql = str_replace(';', '', "$post->sql"); $fields = $post->fieldSettings; - $langs = isset($post->langs) ? json_decode($post->langs, true) : array(); + $langs = !empty($post->langs) ? $post->langs : array(); switch($type) { From 03d80239526b552091c8727ffb23874dd42d5eda Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 24 Apr 2023 11:27:26 +0800 Subject: [PATCH 4/4] * Fix bug #34654. --- module/api/model.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/module/api/model.php b/module/api/model.php index 6ff29d950e..936d5778df 100644 --- a/module/api/model.php +++ b/module/api/model.php @@ -781,8 +781,6 @@ class apiModel extends model $lib->baseUrl = $baseUrl; $lib->acl = 'open'; $lib->users = ',' . $currentAccount . ','; - $lib->addedBy = $currentAccount; - $lib->addedDate = helper::now(); $this->dao->insert(TABLE_DOCLIB)->data($lib)->autoCheck() ->batchCheck($this->config->api->createlib->requiredFields, 'notempty') ->check('name', 'unique', "`type` = 'api'")