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

添加了v9.5 upgrade信息.

Browse Source
This commit is contained in:
pengjiangxiu
2017-08-24 10:46:37 +08:00
parent a96bb17752
commit 37b6e7eb5f
8 changed files with 71 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/control.php
+4 -4
View File
@@ -13,7 +13,7 @@ class upgrade extends control
{
/**
* The index page.
*
*
* @access public
* @return void
*/
@@ -29,18 +29,18 @@ class upgrade extends control
/**
* Check agree license.
*
*
* @access public
* @return void
*/
public function license()
{
{
if($this->get->agree == true) $this->locate(inlink('backup'));
$this->view->title = $this->lang->upgrade->common;
$this->view->license = file_get_contents($this->app->getBasePath() . 'doc/LICENSE');
$this->display();
}
}
/**
* Backup.
module/upgrade/lang/en.php
+1
View File
@@ -123,3 +123,4 @@ $lang->upgrade->fromVersions['9_1_2'] = '9.1.2';
$lang->upgrade->fromVersions['9_2'] = '9.2';
$lang->upgrade->fromVersions['9_2_1'] = '9.2.1';
$lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta';
$lang->upgrade->fromVersions['9_4'] = '9.4';
module/upgrade/lang/zh-cn.php
+1
View File
@@ -123,3 +123,4 @@ $lang->upgrade->fromVersions['9_1_2'] = '9.1.2';
$lang->upgrade->fromVersions['9_2'] = '9.2';
$lang->upgrade->fromVersions['9_2_1'] = '9.2.1';
$lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta';
$lang->upgrade->fromVersions['9_4'] = '9.4';
module/upgrade/lang/zh-tw.php
+1
View File
@@ -123,3 +123,4 @@ $lang->upgrade->fromVersions['9_1_2'] = '9.1.2';
$lang->upgrade->fromVersions['9_2'] = '9.2';
$lang->upgrade->fromVersions['9_2_1'] = '9.2.1';
$lang->upgrade->fromVersions['9_3_beta'] = '9.3.beta';
$lang->upgrade->fromVersions['9_4'] = '9.4';
module/upgrade/model.php
+29 -7
View File
@@ -23,8 +23,8 @@ class upgradeModel extends model
/**
* The execute method. According to the $fromVersion call related methods.
*
* @param string $fromVersion
*
* @param string $fromVersion
* @access public
* @return void
*/
@@ -182,6 +182,9 @@ class upgradeModel extends model
case '9_2_1':
case '9_3_beta':
$this->execSQL($this->getUpgradeFile('9.3.beta'));
case '9_4':
$this->execSQL($this->getUpgradeFile('9.4'));
$this->adjustPriv9_4();
}
$this->deletePatch();
@@ -277,6 +280,7 @@ class upgradeModel extends model
case '9_2':
case '9_2_1':
case '9_3_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('9.3.beta'));
case '9_4': $confirmContent .= file_get_contents($this->getUpgradeFile('9.4'));
}
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}
@@ -322,7 +326,7 @@ class upgradeModel extends model
$bugs = $this->dao->select('id, steps')->from(TABLE_BUG)->fetchAll();
$userTemplates = $this->dao->select('id, content')->from($this->config->db->prefix . 'userTPL')->fetchAll();
foreach($bugs as $id => $bug)
{
$bug->steps = ubb::parseUBB($bug->steps);
@@ -337,7 +341,7 @@ class upgradeModel extends model
/**
* Update nl to br from 1.2 version.
*
*
* @access public
* @return void
*/
@@ -996,7 +1000,7 @@ class upgradeModel extends model
foreach($tables2Rename as $oldTable => $newTable)
{
if(!isset($tablesExists[$oldTable])) continue;
$upgradebak = $newTable . '_othertablebak';
if(isset($tablesExists[$upgradebak])) $this->dbh->query("DROP TABLE `$upgradebak`");
if(isset($tablesExists[$newTable])) $this->dbh->query("RENAME TABLE `$newTable` TO `$upgradebak`");
@@ -1656,7 +1660,7 @@ class upgradeModel extends model
/**
* Adjust priv for 9.2.
*
*
* @access public
* @return void
*/
@@ -1698,9 +1702,27 @@ class upgradeModel extends model
return true;
}
/**
* Adjust priv for 9.4.
*
* @access public
* @return void
*/
public function adjustPriv9_4()
{
$groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('bug')->andWhere('method')->eq('activate')->fetchPairs('group', 'group');
foreach($groups as $groupID)
{
$data = new stdclass();
$data->group = $groupID;
$data->module = 'bug';
$data->method = 'batchActivate';
}
}
/**
* Judge any error occers.
*
*
* @access public
* @return bool
*/