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

* re tag it.

Browse Source
This commit is contained in:
wangchunsheng
2010-07-06 13:15:04 +00:00
parent 7a841b580e 608b98bda6
commit 715f2f4afb
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/bug/control.php
View File

@@ -153,7 +153,7 @@ class bug extends control
}
/* 设置搜索表单。*/
$this->config->bug->search['actionURL'] = $this->createLink('bug', 'browse', "productID=$productID&browseType=bySearch&queryID=queryID");
$this->config->bug->search['actionURL'] = $this->createLink('bug', 'browse', "productID=$productID&browseType=bySearch&queryID=myQueryID");
$this->config->bug->search['queryID'] = $queryID;
$this->config->bug->search['params']['product']['values'] = array($productID => $this->products[$productID], 'all' => $this->lang->bug->allProduct);
$this->config->bug->search['params']['module']['values'] = $this->tree->getOptionMenu($productID, $viewType = 'bug', $rooteModuleID = 0);

2
module/product/control.php
View File

@@ -106,7 +106,7 @@ class product extends control
}
/* 设置搜索条件。*/
$this->config->product->search['actionURL'] = $this->createLink('product', 'browse', "productID=$productID&browseType=bySearch&queryID=queryID");
$this->config->product->search['actionURL'] = $this->createLink('product', 'browse', "productID=$productID&browseType=bySearch&queryID=myQueryID");
$this->config->product->search['queryID'] = $queryID;
$this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID);
$this->view->searchForm = $this->fetch('search', 'buildForm', $this->config->product->search);

2
module/search/view/buildform.html.php
View File

@@ -102,7 +102,7 @@ function saveQuery()
function executeQuery(queryID)
{
if(!queryID) return;
location.href = actionURL.replace('queryID', queryID);
location.href = actionURL.replace('myQueryID', queryID);
}
/* 删除Query。*/

2
module/testcase/control.php
View File

@@ -100,7 +100,7 @@ class testcase extends control
}
/* 构造搜索表单。*/
$this->config->testcase->search['actionURL'] = $this->createLink('testcase', 'browse', "productID=$productID&browseType=bySearch&queryID=queryID");
$this->config->testcase->search['actionURL'] = $this->createLink('testcase', 'browse', "productID=$productID&browseType=bySearch&queryID=myQueryID");
$this->config->testcase->search['queryID'] = $queryID;
$this->view->searchForm = $this->fetch('search', 'buildForm', $this->config->testcase->search);

4
module/upgrade/model.php
View File

@@ -161,7 +161,7 @@ class upgradeModel extends model
$confirmContent .= file_get_contents($this->getUpgradeFile('1.0.rc1'));
$confirmContent .= file_get_contents($this->getUpgradeFile('1.0.1'));
}
elseif($fromVersion == '1_0' || $fromVersion == '1_0_1')
elseif($fromVersion == '1_0rc2' || $fromVersion == '1_0' || $fromVersion == '1_0_1')
{
$confirmContent .= file_get_contents($this->getUpgradeFile('1.0.1'));
}
@@ -241,7 +241,7 @@ class upgradeModel extends model
foreach($userConstants as $key => $value)
{
if(strpos($key, 'TABLE') === false) continue;
if($key == 'TABLE_COMPANY' or $key == 'TABLE_CONFIG') continue;
if($key == 'TABLE_COMPANY' or $key == 'TABLE_CONFIG' or $key == 'TABLE_USERQUERY') continue;
$this->dbh->query("UPDATE $value SET company = '{$this->app->company->id}'");
}
}