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

* fix the parse errors.

Browse Source
This commit is contained in:
wangchunsheng
2011-07-01 07:49:03 +00:00
parent 3e9aa8789c
commit 94e5a7d36b
4 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/convert/control.php
View File

@@ -168,7 +168,6 @@ class convert extends control
public function setParam()
{
if()
if(!empty($_POST))
{
foreach($this->post as $issueType => $aimType)

2
module/convert/converter/redmine.php
View File

@@ -58,7 +58,7 @@ class redmineConvertModel extends convertModel
*/
public function setPath()
{
$this->filePath = realpath($this->post->installPath) . $this->app->getPathFix() . 'redmine' . $this->app->getPathFix();
$this->filePath = realpath($this->post->installPath) . $this->app->getPathFix() . 'files' . $this->app->getPathFix();
}
/**

40
module/convert/converter/redmine1.1.php
View File

@@ -53,22 +53,22 @@ class redmine11ConvertModel extends redmineConvertModel
$this->dao->dbh($this->dbh);
$this->loadModel('tree')->fixModulePath();
$result['group'] = $convertGroupCount
$result['user'] = $convertUserCount
$result['product'] = $convertProductCount
$result['project'] = $convertProjectCount
$result['story'] = $convertStoryCount
$result['task'] = $convertTaskCount
$result['bug'] = $convertBugCount
$result['productPlan'] = $convertProductPlanCount
$result['team'] = $convertTeamCount
$result['release'] = $convertReleaseCount
$result['build'] = $convertBuildCount
$result['docLib'] = $convertDocLibCount
$result['doc'] = $convertDocCount
$result['file'] = $convertFileCount
return $result;
}
$result['group'] = $convertGroupCount;
$result['user'] = $convertUserCount ;
$result['product'] = $convertProductCount ;
$result['project'] = $convertProjectCount ;
$result['story'] = $convertStoryCount;
$result['task'] = $convertTaskCount ;
$result['bug'] = $convertBugCount ;
$result['productPlan'] = $convertProductPlanCount;
$result['team'] = $convertTeamCount;
$result['release'] = $convertReleaseCount;
$result['build'] = $convertBuildCount;
$result['docLib'] = $convertDocLibCount ;
$result['doc'] = $convertDocCount;
$result['file'] = $convertFileCount;
return $result;
}
/**
* Set table names.
@@ -166,10 +166,10 @@ class redmine11ConvertModel extends redmineConvertModel
{
/* Get user list. */
$users = $this->dao->dbh($this->sourceDBH)
->select("login AS account, firstname, lastname, email")
->select("login AS account, firstname, lastname, mail")
->from(REDMINE_TABLE_USERS)
->where('type')->eq('User')
->orderBy('userID ASC')
->orderBy('id ASC')
->fetchAll('id', $autoCompany = false);
/* Insert into zentao. */
@@ -677,7 +677,7 @@ class redmine11ConvertModel extends redmineConvertModel
}
elseif($file['objectType'] == 'Document')
{
$file['objectType'] = 'doc'
$file['objectType'] = 'doc' ;
$file['objectID'] = $this->map['docs'][$file['objectID']];
}
elseif($file['objectType'] == 'WikiPage')
@@ -701,7 +701,7 @@ class redmine11ConvertModel extends redmineConvertModel
$file['objectID'] = $this->dao->lastInsertID();
}
$pathname = pathinfo($file['pathname'])
$pathname = pathinfo($file['pathname']);
$file['extension'] = $pathname["extension"];
/* Insert into database. */

2
module/convert/lang/zh-cn.php
View File

@@ -35,7 +35,7 @@ $lang->convert->directionList['task'] = '任务';
$lang->convert->directionList['story'] = '需求';
$lang->convert->sourceList['BugFree'] = array('bugfree_1' => '1.x', 'bugfree_2' => '2.x');
$lang->convert->sourceList['Redmine'] = array('Redmine_1_1' => '1.1');
$lang->convert->sourceList['Redmine'] = array('Redmine_1.1' => '1.1');
$lang->convert->setting = '设置';
$lang->convert->checkConfig = '检查配置';