diff --git a/db/update22.0.sql b/db/update22.0.sql index 3e806d7f7b..3b751ad60b 100644 --- a/db/update22.0.sql +++ b/db/update22.0.sql @@ -6,7 +6,7 @@ ALTER TABLE `zt_deliverable` ADD `trimRule` varchar(255) NOT NULL AFTER `trimmab ALTER TABLE `zt_deliverable` ADD `template` text NOT NULL AFTER `trimRule`; ALTER TABLE `zt_deliverable` ADD `status` varchar(30) NOT NULL DEFAULT 'enabled' AFTER `name`; ALTER TABLE `zt_deliverable` ADD `category` varchar(255) NOT NULL DEFAULT '' AFTER `lastEditedDate`; -ALTER TABLE `zt_deliverable` ADD `buitin` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `module`; +ALTER TABLE `zt_deliverable` ADD `builtin` tinyint(1) unsigned NOT NULL DEFAULT '0' AFTER `module`; CREATE TABLE IF NOT EXISTS `zt_deliverablestage` ( `id` int(8) unsigned NOT NULL AUTO_INCREMENT, diff --git a/db/zentao.sql b/db/zentao.sql index 0034a0b2f1..4bbfead4b3 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -596,7 +596,7 @@ CREATE TABLE `zt_deliverable` ( `id` int(8) unsigned NOT NULL AUTO_INCREMENT, `workflowGroup` int(8) unsigned NOT NULL DEFAULT 0, `module` mediumint(8) unsigned NOT NULL DEFAULT 0, - `buitin` tinyint(1) unsigned NOT NULL DEFAULT 0, + `builtin` tinyint(1) unsigned NOT NULL DEFAULT 0, `name` varchar(255) NOT NULL, `status` varchar(30) NOT NULL DEFAULT 'enabled', `activity` int(8) unsigned NOT NULL DEFAULT 0, diff --git a/module/upgrade/model.php b/module/upgrade/model.php index c1f04fe0e7..b44c7a5fac 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -11582,7 +11582,7 @@ class upgradeModel extends model ->fetchPairs(); $testDeliverable = $this->dao->select('category')->from(TABLE_DELIVERABLE) - ->where('buitin')->eq('1') + ->where('builtin')->eq('1') ->andWhere('module')->in($testModules) ->fetchPairs(); @@ -11592,7 +11592,7 @@ class upgradeModel extends model if(empty($name)) continue; if(!empty($testDeliverable[$key])) { - $this->dao->update(TABLE_DELIVERABLE)->set('deleted')->eq('0')->set('name')->eq($name . $this->lang->upgrade->list)->where('category')->eq($key)->andWhere('buitin')->eq('1')->exec(); + $this->dao->update(TABLE_DELIVERABLE)->set('deleted')->eq('0')->set('name')->eq($name . $this->lang->upgrade->list)->where('category')->eq($key)->andWhere('builtin')->eq('1')->exec(); unset($modules[$key]); } } @@ -11611,7 +11611,7 @@ class upgradeModel extends model $deliverable->createdBy = 'system'; $deliverable->createdDate = helper::now(); $deliverable->template = '[]'; - $deliverable->buitin = '1'; + $deliverable->builtin = '1'; $deliverableStage = new stdClass(); $deliverableStage->stage = 'project'; @@ -11657,7 +11657,7 @@ class upgradeModel extends model { foreach($modules as $key => $name) { - $this->dao->update(TABLE_DELIVERABLE)->set('deleted')->eq('1')->where('category')->eq($key)->andWhere('buitin')->eq('1')->exec(); + $this->dao->update(TABLE_DELIVERABLE)->set('deleted')->eq('1')->where('category')->eq($key)->andWhere('builtin')->eq('1')->exec(); } return true; } @@ -11674,7 +11674,7 @@ class upgradeModel extends model { foreach($modules as $key => $name) { - $this->dao->update(TABLE_DELIVERABLE)->set('name')->eq($name . $this->lang->upgrade->list)->where('category')->eq($key)->andWhere('buitin')->eq('1')->exec(); + $this->dao->update(TABLE_DELIVERABLE)->set('name')->eq($name . $this->lang->upgrade->list)->where('category')->eq($key)->andWhere('builtin')->eq('1')->exec(); } return true; }