* updata upgrade.
This commit is contained in:
@@ -432,7 +432,7 @@ class project extends control
|
||||
$sets = $this->project->getBurnDataFlot($project->id);
|
||||
$count = $sets['count'];
|
||||
unset($sets['count']);
|
||||
$dataJSON = $this->report->createSingleXMLFlot($sets);
|
||||
$dataJSON = $this->report->createSingleJSON($sets);
|
||||
$charts = $this->report->createJSChartFlot($project->name, $dataJSON, $count, 700, 350);
|
||||
|
||||
/* Assign. */
|
||||
|
||||
@@ -180,7 +180,7 @@ EOT;
|
||||
return $data;
|
||||
}
|
||||
|
||||
public function createSingleXMLFlot($sets)
|
||||
public function createSingleJSON($sets)
|
||||
{
|
||||
$data = '[';
|
||||
foreach($sets as $set)
|
||||
|
||||
@@ -51,3 +51,4 @@ $lang->upgrade->fromVersions['1_3'] = '1.3';
|
||||
$lang->upgrade->fromVersions['1_4'] = '1.4';
|
||||
$lang->upgrade->fromVersions['1_5'] = '1.5';
|
||||
$lang->upgrade->fromVersions['2_0'] = '2.0';
|
||||
$lang->upgrade->fromVersions['2_1'] = '2.1';
|
||||
|
||||
@@ -51,3 +51,4 @@ $lang->upgrade->fromVersions['1_3'] = '1.3';
|
||||
$lang->upgrade->fromVersions['1_4'] = '1.4';
|
||||
$lang->upgrade->fromVersions['1_5'] = '1.5';
|
||||
$lang->upgrade->fromVersions['2_0'] = '2.0';
|
||||
$lang->upgrade->fromVersions['2_1'] = '2.1';
|
||||
|
||||
@@ -47,6 +47,7 @@ class upgradeModel extends model
|
||||
$this->upgradeFrom1_4To1_5();
|
||||
$this->upgradeFrom1_5To2_0();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '0_4beta')
|
||||
{
|
||||
@@ -64,6 +65,7 @@ class upgradeModel extends model
|
||||
$this->upgradeFrom1_4To1_5();
|
||||
$this->upgradeFrom1_5To2_0();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '0_5beta')
|
||||
{
|
||||
@@ -79,6 +81,7 @@ class upgradeModel extends model
|
||||
$this->upgradeFrom1_3To1_4();
|
||||
$this->upgradeFrom1_4To1_5();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '0_6beta')
|
||||
{
|
||||
@@ -93,6 +96,7 @@ class upgradeModel extends model
|
||||
$this->upgradeFrom1_3To1_4();
|
||||
$this->upgradeFrom1_4To1_5();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '1_0beta')
|
||||
{
|
||||
@@ -107,6 +111,7 @@ class upgradeModel extends model
|
||||
$this->upgradeFrom1_4To1_5();
|
||||
$this->upgradeFrom1_5To2_0();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '1_0rc1')
|
||||
{
|
||||
@@ -120,6 +125,7 @@ class upgradeModel extends model
|
||||
$this->upgradeFrom1_4To1_5();
|
||||
$this->upgradeFrom1_5To2_0();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '1_0rc2')
|
||||
{
|
||||
@@ -132,6 +138,7 @@ class upgradeModel extends model
|
||||
$this->upgradeFrom1_4To1_5();
|
||||
$this->upgradeFrom1_5To2_0();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '1_0')
|
||||
{
|
||||
@@ -143,6 +150,7 @@ class upgradeModel extends model
|
||||
$this->upgradeFrom1_4To1_5();
|
||||
$this->upgradeFrom1_5To2_0();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '1_0_1')
|
||||
{
|
||||
@@ -153,6 +161,7 @@ class upgradeModel extends model
|
||||
$this->upgradeFrom1_4To1_5();
|
||||
$this->upgradeFrom1_5To2_0();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '1_1')
|
||||
{
|
||||
@@ -162,6 +171,7 @@ class upgradeModel extends model
|
||||
$this->upgradeFrom1_4To1_5();
|
||||
$this->upgradeFrom1_5To2_0();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '1_2')
|
||||
{
|
||||
@@ -170,6 +180,7 @@ class upgradeModel extends model
|
||||
$this->upgradeFrom1_4To1_5();
|
||||
$this->upgradeFrom1_5To2_0();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '1_3')
|
||||
{
|
||||
@@ -177,21 +188,29 @@ class upgradeModel extends model
|
||||
$this->upgradeFrom1_4To1_5();
|
||||
$this->upgradeFrom1_5To2_0();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '1_4')
|
||||
{
|
||||
$this->upgradeFrom1_4To1_5();
|
||||
$this->upgradeFrom1_5To2_0();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '1_5')
|
||||
{
|
||||
$this->upgradeFrom1_5To2_0();
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '2_0')
|
||||
{
|
||||
$this->upgradeFrom2_0To2_1();
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
elseif($fromVersion == '2_1')
|
||||
{
|
||||
$this->upgradeFrom2_1To2_2();
|
||||
}
|
||||
|
||||
$this->setting->setSN();
|
||||
@@ -524,6 +543,18 @@ class upgradeModel extends model
|
||||
if(!$this->isError()) $this->setting->updateVersion('2.1');
|
||||
}
|
||||
|
||||
/**
|
||||
* Upgrade from 2.1 to 2.2.
|
||||
*
|
||||
* @access private
|
||||
* @return void
|
||||
*/
|
||||
private function upgradeFrom2_1To2_2()
|
||||
{
|
||||
$this->execSQL($this->getUpgradeFile('2.1'));
|
||||
if(!$this->isError()) $this->setting->updateVersion('2.2');
|
||||
}
|
||||
|
||||
/**
|
||||
* Update company field.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user