Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* update upgrade for 3.2.1.

Browse Source
This commit is contained in:
shiyangyangwork@yahoo.cn
2012-07-16 01:58:48 +00:00
parent b6da51a3e1
commit cf69fb93da
15 changed files with 123 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.php
+1 -1
View File
@@ -12,7 +12,7 @@
* @link http://www.zentao.net
*/
/* Basic settings. */
$config->version = '3.2'; // The version of zentaopms. Don't change it.
$config->version = '3.2.1'; // The version of zentaopms. Don't change it.
$config->encoding = 'UTF-8'; // The encoding of zentaopms.
$config->cookieLife = time() + 2592000; // The cookie life time.
$config->timezone = 'Asia/Shanghai'; // The time zone setting, for more see http://www.php.net/manual/en/timezones.php
db/update3.2.sql
View File
module/bug/lang/zh-tw.php
+8 -8
View File
@@ -6,7 +6,7 @@
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package bug
* @version $Id: zh-tw.php 3238 2012-07-02 01:44:49Z wwccss $
* @version $Id: zh-tw.php 3343 2012-07-16 01:15:26Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
/* 欄位列表。*/
@@ -66,17 +66,17 @@ $lang->bug->lastEditedDateAB = '修改日期';
/* 方法列表。*/
$lang->bug->index = '首頁';
$lang->bug->create = '創建Bug';
$lang->bug->create = '創建';
$lang->bug->confirmBug = '確認';
$lang->bug->edit = '編輯Bug';
$lang->bug->assignTo = '指派';
$lang->bug->browse = 'Bug列表';
$lang->bug->view = 'Bug詳情';
$lang->bug->resolve = '解決Bug';
$lang->bug->close = '關閉Bug';
$lang->bug->resolve = '解決';
$lang->bug->close = '關閉';
$lang->bug->activate = '激活Bug';
$lang->bug->reportChart = '報表統計';
$lang->bug->export = '導出數據';
$lang->bug->export = '導出';
$lang->bug->delete = '刪除Bug';
$lang->bug->saveTemplate = '保存模板';
$lang->bug->deleteTemplate = '刪除模板';
@@ -98,8 +98,8 @@ $lang->bug->unResolved = '未解決';
$lang->bug->unclosed = '未關閉';
$lang->bug->longLifeBugs = '久未處理';
$lang->bug->postponedBugs = '被延期';
$lang->bug->allBugs = '所有Bug';
$lang->bug->moduleBugs = '按模組瀏覽';
$lang->bug->allBugs = '所有';
$lang->bug->moduleBugs = '按模組';
$lang->bug->byQuery = '搜索';
$lang->bug->needConfirm = '需求變動';
$lang->bug->allProduct = '所有產品';
@@ -241,7 +241,7 @@ $lang->bug->resolutionList['willnotfix'] = "不予解決";
$lang->bug->resolutionList['tostory'] = '轉為需求';
/* 統計報表。*/
$lang->bug->report->common = '統計報表';
$lang->bug->report->common = '報表';
$lang->bug->report->select = '請選擇報表類型';
$lang->bug->report->create = '生成報表';
module/build/lang/zh-tw.php
+1 -1
View File
@@ -6,7 +6,7 @@
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package build
* @version $Id: zh-tw.php 3307 2012-07-03 02:45:15Z wwccss $
* @version $Id: zh-tw.php 3309 2012-07-03 02:53:55Z wwccss $
* @link http://www.zentao.net
*/
$lang->build->common = "Build";
module/group/lang/en.php
+1
View File
@@ -40,6 +40,7 @@ $lang->group->copyOptions['copyPriv'] = 'Copy priviledge';
$lang->group->copyOptions['copyUser'] = 'Copy user';
$lang->group->versions[''] = 'Show methods added in every release';
$lang->group->versions['3.2.1'] = '3.2.1';
$lang->group->versions['3.2'] = '3.2';
$lang->group->versions['3.1'] = '3.1';
$lang->group->versions['3.0.beta2'] = '3.0.beta2';
module/group/lang/zh-cn.php
+1
View File
@@ -40,6 +40,7 @@ $lang->group->copyOptions['copyPriv'] = '复制权限';
$lang->group->copyOptions['copyUser'] = '复制用户';
$lang->group->versions[''] = '显示各版本新增权限';
$lang->group->versions['3.2.1'] = '禅道3.2.1';
$lang->group->versions['3.2'] = '禅道3.2';
$lang->group->versions['3.1'] = '禅道3.1';
$lang->group->versions['3.0.beta2'] = '禅道3.0.beta2';
module/group/lang/zh-tw.php
+1
View File
@@ -40,6 +40,7 @@ $lang->group->copyOptions['copyPriv'] = '複製權限';
$lang->group->copyOptions['copyUser'] = '複製用戶';
$lang->group->versions[''] = '顯示各版本新增權限';
$lang->group->versions['3.2.1'] = '禪道3.2.1';
$lang->group->versions['3.2'] = '禪道3.2';
$lang->group->versions['3.1'] = '禪道3.1';
$lang->group->versions['3.0.beta2'] = '禪道3.0.beta2';
module/product/lang/zh-tw.php
+2 -2
View File
@@ -6,7 +6,7 @@
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package product
* @version $Id: zh-tw.php 3294 2012-07-02 15:56:54Z wwccss $
* @version $Id: zh-tw.php 3343 2012-07-16 01:15:26Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->product->common = '產品視圖';
@@ -59,7 +59,7 @@ $lang->product->RM = '發佈負責人';
$lang->product->acl = '訪問控制';
$lang->product->whitelist = '分組白名單';
$lang->product->moduleStory = '按模組瀏覽';
$lang->product->moduleStory = '按模組';
$lang->product->searchStory = '搜索';
$lang->product->assignedToMe = '指派給我';
$lang->product->openedByMe = '由我創建';
module/project/lang/zh-tw.php
+4 -4
View File
@@ -6,7 +6,7 @@
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package project
* @version $Id: zh-tw.php 3238 2012-07-02 01:44:49Z wwccss $
* @version $Id: zh-tw.php 3343 2012-07-16 01:15:26Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
/* 欄位列表。*/
@@ -108,9 +108,9 @@ $lang->project->importBug = '導入Bug';
$lang->project->ajaxGetProducts = '介面：獲得項目產品列表';
/* 分組瀏覽。*/
$lang->project->allTasks = '所有任務';
$lang->project->allTasks = '所有';
$lang->project->assignedToMe = '指派給我';
$lang->project->moduleTask = '按模組瀏覽';
$lang->project->moduleTask = '按模組';
$lang->project->finishedByMe = '由我完成';
$lang->project->statusWait = '未開始';
$lang->project->statusDoing = '進行中';
@@ -183,4 +183,4 @@ $lang->project->placeholder->code = '團隊內部的簡稱';
$lang->project->selectGroup->doing = '(進行中)';
$lang->project->selectGroup->done = '(已結束)';
$lang->project->projectTasks = '按項目瀏覽';
$lang->project->projectTasks = '按項目';
module/report/lang/zh-tw.php
+7 -2
View File
@@ -6,7 +6,7 @@
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package report
* @version $Id: zh-tw.php 3299 2012-07-03 01:00:09Z zhujinyonging@gmail.com $
* @version $Id: zh-tw.php 3336 2012-07-11 08:36:27Z zhujinyonging@gmail.com $
* @link http://www.zentao.net
*/
$lang->report->common = '統計視圖';
@@ -35,8 +35,13 @@ $lang->report->singleColor[] = 'F6BD0F';
$lang->report->projectDeviation = '項目偏差報表';
$lang->report->productInfo = '產品信息統計表';
$lang->report->workload = '員工負載表';
$lang->report->bugSummary = 'Bug彙總表';
$lang->report->workload = '員工負載表';
$lang->reportList->project->lists[10] = '項目偏差報表|report|projectdeviation';
$lang->reportList->product->lists[10] = '產品信息統計表|report|productinfo';
$lang->reportList->test->lists[10] = 'Bug彙總表|report|bugsummary';
$lang->reportList->staff->lists[10] = '員工負載表|report|workload';
$lang->report->id = '編號';
$lang->report->project = '項目';
module/story/lang/zh-tw.php
+4 -4
View File
@@ -6,11 +6,11 @@
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package story
* @version $Id: zh-tw.php 3238 2012-07-02 01:44:49Z wwccss $
* @version $Id: zh-tw.php 3341 2012-07-14 07:26:53Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->story->browse = "需求列表";
$lang->story->create = "新增需求";
$lang->story->create = "新增";
$lang->story->createCase = "建用例";
$lang->story->batchCreate = "批量添加";
$lang->story->change = "變更";
@@ -26,7 +26,7 @@ $lang->story->tasks = "相關任務";
$lang->story->taskCount = '任務數';
$lang->story->bugs = "Bug";
$lang->story->linkStory = '關聯需求';
$lang->story->export = "導出數據";
$lang->story->export = "導出";
$lang->story->reportChart = "統計報表";
$lang->story->common = '需求';
@@ -189,7 +189,7 @@ $lang->story->action->linked2project = array('main' => '$date, 由 <strong>
$lang->story->action->unlinkedfromproject = array('main' => '$date, 由 <strong>$actor</strong> 從項目 <strong>$extra</strong> 移除。');
/* 統計報表。*/
$lang->story->report->common = '統計報表';
$lang->story->report->common = '報表';
$lang->story->report->select = '請選擇報表類型';
$lang->story->report->create = '生成報表';
module/task/lang/zh-tw.php
+12 -11
View File
@@ -6,25 +6,25 @@
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package task
* @version $Id: zh-tw.php 3238 2012-07-02 01:44:49Z wwccss $
* @version $Id: zh-tw.php 3341 2012-07-14 07:26:53Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->task->index = "任務一覽";
$lang->task->create = "新增任務";
$lang->task->create = "新增";
$lang->task->batchCreate = "批量添加";
$lang->task->batchEdit = "批量編輯";
$lang->task->import = "導入之前未完任務";
$lang->task->edit = "編輯任務";
$lang->task->delete = "刪除任務";
$lang->task->edit = "編輯";
$lang->task->delete = "刪除";
$lang->task->view = "查看任務";
$lang->task->logEfforts = "記錄工時";
$lang->task->start = "開始任務";
$lang->task->finish = "完成任務";
$lang->task->close = "關閉任務";
$lang->task->start = "開始";
$lang->task->finish = "完成";
$lang->task->close = "關閉";
$lang->task->batchClose = "批量關閉";
$lang->task->cancel = "取消任務";
$lang->task->activate = "激活任務";
$lang->task->export = "導出數據";
$lang->task->cancel = "取消";
$lang->task->activate = "激活";
$lang->task->export = "導出";
$lang->task->reportChart = "報表統計";
$lang->task->fromBug = '來源Bug';
$lang->task->confirmStoryChange = "確認需求變動";
@@ -54,6 +54,7 @@ $lang->task->status = '任務狀態';
$lang->task->statusCustom = '狀態排序';
$lang->task->desc = '任務描述';
$lang->task->assign = '指派';
$lang->task->assignTo = $lang->task->assign;
$lang->task->assignedTo = '指派給';
$lang->task->assignedToAB = '指派給';
$lang->task->assignedDate = '指派日期';
@@ -134,7 +135,7 @@ $lang->task->delayWarning = " <strong class='delayed f-14px'> 延期%s天
$lang->task->remindBug = "該任務為Bug轉化得到，是否更新Bug:%s ?";
/* 統計報表。*/
$lang->task->report->common = '統計報表';
$lang->task->report->common = '報表';
$lang->task->report->select = '請選擇報表類型';
$lang->task->report->create = '生成報表';
module/testcase/lang/zh-tw.php
+6 -6
View File
@@ -6,7 +6,7 @@
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package testcase
* @version $Id: zh-tw.php 3238 2012-07-02 01:44:49Z wwccss $
* @version $Id: zh-tw.php 3343 2012-07-16 01:15:26Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->testcase->id = '用例編號';
@@ -49,7 +49,7 @@ $lang->testcase->stepExpect = '預期';
$lang->testcase->common = '用例管理';
$lang->testcase->index = "用例管理首頁";
$lang->testcase->create = "創建用例";
$lang->testcase->create = "建用例";
$lang->testcase->batchCreate = "批量添加";
$lang->testcase->delete = "刪除用例";
$lang->testcase->view = "用例詳情";
@@ -57,7 +57,7 @@ $lang->testcase->edit = "編輯用例";
$lang->testcase->delete = "刪除用例";
$lang->testcase->browse = "用例列表";
$lang->testcase->import = "導入用例";
$lang->testcase->export = "導出數據";
$lang->testcase->export = "導出";
$lang->testcase->confirmStoryChange = '確認需求變動';
$lang->testcase->deleteStep = '刪除';
@@ -68,9 +68,9 @@ $lang->testcase->selectProduct = '請選擇產品';
$lang->testcase->byModule = '按模組';
$lang->testcase->assignToMe = '指派給我的用例';
$lang->testcase->openedByMe = '由我創建的用例';
$lang->testcase->allCases = '所有用例';
$lang->testcase->needConfirm = '需求有變動的用例';
$lang->testcase->moduleCases = '按模組瀏覽';
$lang->testcase->allCases = '所有';
$lang->testcase->needConfirm = '需求變動';
$lang->testcase->moduleCases = '按模組';
$lang->testcase->bySearch = '搜索';
$lang->testcase->doneByMe = '我完成的用例';
module/todo/lang/zh-tw.php
+11 -11
View File
@@ -6,12 +6,12 @@
* @license LGPL (http://www.gnu.org/licenses/lgpl.html)
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
* @package todo
* @version $Id: zh-tw.php 3018 2012-06-08 02:47:49Z chencongzhi520@gmail.com $
* @version $Id: zh-tw.php 3343 2012-07-16 01:15:26Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->todo->common = 'TODO';
$lang->todo->index = "todo一覽";
$lang->todo->create = "新增TODO";
$lang->todo->create = "新增";
$lang->todo->batchCreate = "批量添加";
$lang->todo->edit = "更新TODO";
$lang->todo->view = "TODO詳情";
@@ -71,15 +71,15 @@ $lang->todo->successMarked = "成功切換狀態！";
$lang->todo->thisIsPrivate = '這是一條私人事務。:)';
$lang->todo->lblDisableDate = '暫時不設定時間';
$lang->todo->thisWeekTodos = '本週計劃';
$lang->todo->lastWeekTodos = '上周工作';
$lang->todo->thisWeekTodos = '本週';
$lang->todo->lastWeekTodos = '上周';
$lang->todo->futureTodos = '暫不指定';
$lang->todo->allDaysTodos = '所有TODO';
$lang->todo->allDaysTodos = '所有';
$lang->todo->allUndone = '之前未完';
$lang->todo->todayTodos = '今日安排';
$lang->todo->yesterdayTodos = '昨日安排';
$lang->todo->lastmonthTodos = '上月TODO';
$lang->todo->thisseasonTodos = '本季TODO';
$lang->todo->thisyearTodos = '本年TODO';
$lang->todo->thismonthTodos = '本月TODO';
$lang->todo->todayTodos = '今日';
$lang->todo->yesterdayTodos = '昨日';
$lang->todo->lastmonthTodos = '上月';
$lang->todo->thisseasonTodos = '本季';
$lang->todo->thisyearTodos = '本年';
$lang->todo->thismonthTodos = '本月';
$lang->todo->action->marked = array('main' => '$date, 由 <strong>$actor</strong> 標記為<strong>$extra</strong>。', 'extra' => $lang->todo->statusList);
module/upgrade/model.php
+64
View File
@@ -55,6 +55,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '0_4beta')
{
@@ -80,6 +81,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '0_5beta')
{
@@ -103,6 +105,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '0_6beta')
{
@@ -125,6 +128,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '1_0beta')
{
@@ -147,6 +151,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '1_0rc1')
{
@@ -168,6 +173,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '1_0rc2')
{
@@ -188,6 +194,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '1_0')
{
@@ -207,6 +214,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '1_0_1')
{
@@ -225,6 +233,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '1_1')
{
@@ -242,6 +251,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '1_2')
{
@@ -258,6 +268,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '1_3')
{
@@ -273,6 +284,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '1_4')
{
@@ -287,6 +299,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '1_5')
{
@@ -300,6 +313,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '2_0')
{
@@ -312,6 +326,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '2_1')
{
@@ -323,6 +338,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '2_2')
{
@@ -333,6 +349,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '2_3')
{
@@ -342,6 +359,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '2_4')
{
@@ -350,6 +368,7 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '3_0_beta1')
{
@@ -357,21 +376,29 @@ class upgradeModel extends model
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '3_0_beta2')
{
$this->upgradeFrom3_0_beta2To3_0_stable();
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '3_0')
{
$this->upgradeFrom3_0To3_1();
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '3_1')
{
$this->upgradeFrom3_1To3_2();
$this->upgradeFrom3_2To3_2_1();
}
elseif($fromVersion == '3_2')
{
$this->upgradeFrom3_2To3_2_1();
}
$this->deletePatch();
@@ -408,6 +435,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '0_4beta')
{
@@ -429,6 +457,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '0_5beta')
{
@@ -449,6 +478,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '0_6beta')
{
@@ -468,6 +498,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '1_0beta')
{
@@ -486,6 +517,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '1_0rc1')
{
@@ -503,6 +535,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '1_0rc2' || $fromVersion == '1_0' || $fromVersion == '1_0_1')
{
@@ -519,6 +552,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '1_1')
{
@@ -534,6 +568,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '1_2')
{
@@ -548,6 +583,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '1_3')
{
@@ -561,6 +597,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '1_4')
{
@@ -573,6 +610,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '1_5')
{
@@ -584,6 +622,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '2_0')
{
@@ -594,6 +633,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '2_1')
{
@@ -603,6 +643,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '2_2')
{
@@ -611,6 +652,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '2_3')
{
@@ -618,29 +660,39 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '2_4')
{
$confirmContent .= file_get_contents($this->getUpgradeFile('2.4'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '3_0_beta1')
{
$confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '3_0_beta2')
{
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '3_0')
{
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '3_1')
{
$confirmContent .= file_get_contents($this->getUpgradeFile('3.1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
elseif($fromVersion == '3_2')
{
$confirmContent .= file_get_contents($this->getUpgradeFile('3.2'));
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
@@ -927,6 +979,18 @@ class upgradeModel extends model
if(!$this->isError()) $this->setting->updateVersion('3.2');
}
/**
* Upgrade from 3.1 to 3.2.
*
* @access public
* @return void
*/
public function upgradeFrom3_2To3_2_1()
{
$this->execSQL($this->getUpgradeFile('3.2'));
if(!$this->isError()) $this->setting->updateVersion('3.2.1');
}
/**
* Update company field.
*