diff --git a/db/update15.0.sql b/db/update15.0.sql index f3d4d00c13..1c0584c3b8 100644 --- a/db/update15.0.sql +++ b/db/update15.0.sql @@ -39,7 +39,6 @@ ALTER TABLE `zt_webhook` CHANGE `projects` `executions` mediumint(8) unsigned NO ALTER TABLE `zt_task` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; ALTER TABLE `zt_doclib` ADD `project` mediumint(8) unsigned NOT NULL AFTER `product`; ALTER TABLE `zt_doc` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; -ALTER TABLE `zt_story` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; ALTER TABLE `zt_bug` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; ALTER TABLE `zt_case` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; ALTER TABLE `zt_testtask` ADD `project` mediumint(8) unsigned NOT NULL AFTER `id`; diff --git a/db/zentao.sql b/db/zentao.sql index 0752a52985..a20bee89ee 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -807,7 +807,6 @@ CREATE TABLE IF NOT EXISTS `zt_stakeholder` ( -- DROP TABLE IF EXISTS `zt_story`; CREATE TABLE IF NOT EXISTS `zt_story` ( `id` mediumint(8) unsigned NOT NULL auto_increment, - `project` mediumint(8) unsigned NOT NULL, `parent` mediumint(9) NOT NULL default '0', `product` mediumint(8) unsigned NOT NULL default '0', `branch` mediumint(8) unsigned NOT NULL default '0', @@ -1550,7 +1549,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (1,'program','whitelist'), (1,'program','unbindWhielist'), (1,'program','unlinkStakeholder'), -(1,'program','view'), (1,'project','activate'), (1,'project','all'), (1,'project','batchedit'), @@ -2358,7 +2356,6 @@ INSERT INTO `zt_grouppriv` (`group`, `module`, `method`) VALUES (4,'program','whitelist'), (4,'program','unbindWhielist'), (4,'program','unlinkStakeholder'), -(4,'program','view'), (4,'project','activate'), (4,'project','all'), (4,'project','batchedit'), @@ -4147,5 +4144,3 @@ INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES (' INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'custom', '', 'URSR', '6'); INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'project', '', 'unitList', 'CNY,USD'); INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'project', '', 'defaultCurrency', 'CNY'); -INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', '', 'CRProduct', '1'); -INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', '', 'CRExecution', '1'); diff --git a/lib/front/front.class.php b/lib/front/front.class.php index 4777fb3936..1f70cd3b39 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -12,6 +12,7 @@ */ helper::import(dirname(dirname(__FILE__)) . '/base/front/front.class.php'); + /** * html类,生成html标签。 * The html class, to build html tags. diff --git a/module/block/view/scrumtestblock.html.php b/module/block/view/scrumtestblock.html.php index 6b86a25809..5dde0ec7ba 100644 --- a/module/block/view/scrumtestblock.html.php +++ b/module/block/view/scrumtestblock.html.php @@ -22,7 +22,7 @@ testtask->product;?> - testtask->project?> + testtask->execution?> testtask->build;?> testtask->status;?> diff --git a/module/build/model.php b/module/build/model.php index c3b06200cb..4dd05b93e9 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -144,21 +144,21 @@ class buildModel extends model $this->session->set('projectBuildForm', $query->form); } } - if($this->session->PRJBuildQuery == false) $this->session->set('projectBuildQuery', ' 1 = 1'); + if($this->session->projectBuildQuery == false) $this->session->set('projectBuildQuery', ' 1 = 1'); - $buildQuery = $this->session->PRJBuildQuery; + $buildQuery = $this->session->projectBuildQuery; /* Distinguish between repeated fields. */ $fields = array('id' => '`id`', 'name' => '`name`', 'product' => '`product`', 'desc' => '`desc`', 'project' => '`project`'); foreach($fields as $field) { - if(strpos($this->session->PRJBuildQuery, $field) !== false) + if(strpos($this->session->projectBuildQuery, $field) !== false) { $buildQuery = str_replace($field, "t1." . $field, $buildQuery); } } - return $this->getExecutionBuilds($executionID, 'bysearch', $buildQuery); + return $this->getProjectBuilds($projectID, 'bysearch', $buildQuery); } /** diff --git a/module/caselib/model.php b/module/caselib/model.php index 2a5398c576..4b878de252 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -122,7 +122,7 @@ class caselibModel extends model { $dropMenuLink = helper::createLink('caselib', 'ajaxGetDropMenu', "objectID=$libID&module=caselib&method=browse"); - $output = "