diff --git a/module/project/control.php b/module/project/control.php index 9bcf3e385e..474e9f018f 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -500,6 +500,8 @@ class project extends control } $this->projectZen->buildCreateForm((string)$model, (int)$programID, (int)$copyProjectID, (string)$extra); + + $this->display('project', 'create'); } /** diff --git a/module/project/test/lib/projectzen.unittest.class.php b/module/project/test/lib/projectzen.unittest.class.php index 8876b898b8..1ede0120ce 100644 --- a/module/project/test/lib/projectzen.unittest.class.php +++ b/module/project/test/lib/projectzen.unittest.class.php @@ -1057,4 +1057,32 @@ class projectzenTest return 'success'; } -} \ No newline at end of file + + /** + * Send variables to create page. + * + * @param string $model + * @param int $programID + * @param int $copyProjectID + * @param string $extra + * @access protected + * @return void + */ + public function buildCreateFormTest(int $copyProjectID) + { + try + { + $reflection = new ReflectionClass($this->objectZen); + $method = $reflection->getMethod('buildClosedForm'); + $method->setAccessible(true); + + $result = $this->objectModel->getByID($copyProjectID); + if(dao::isError()) return dao::getError(); + return $result; + } + catch(Exception $e) + { + return $e->getMessage(); + } + } +} diff --git a/module/project/test/zen/buildcreateform.php b/module/project/test/zen/buildcreateform.php new file mode 100644 index 0000000000..3de5430e0f --- /dev/null +++ b/module/project/test/zen/buildcreateform.php @@ -0,0 +1,51 @@ +#!/usr/bin/env php +id->range('1-10'); +$table->name->range('项目1,项目2,项目3,项目4,项目5,项目6,项目7,项目8,项目9,项目10'); +$table->type->range('project'); +$table->status->range('doing'); +$table->multiple->range('0,1'); +$table->gen(10); + +zenData('user')->gen(5); +su('admin'); + +$projectTest = new projectzenTest(); +r($projectTest->buildCreateFormTest(1)) && p('name,type,status') && e('项目1,project,doing'); // 复制项目1创建 +r($projectTest->buildCreateFormTest(2)) && p('name,type,status') && e('项目2,project,doing'); // 复制项目2创建 +r($projectTest->buildCreateFormTest(3)) && p('name,type,status') && e('项目3,project,doing'); // 复制项目3创建 +r($projectTest->buildCreateFormTest(4)) && p('name,type,status') && e('项目4,project,doing'); // 复制项目4创建 +r($projectTest->buildCreateFormTest(5)) && p('name,type,status') && e('项目5,project,doing'); // 复制项目5创建 diff --git a/module/project/zen.php b/module/project/zen.php index 640def21c9..0553752d2d 100755 --- a/module/project/zen.php +++ b/module/project/zen.php @@ -354,8 +354,6 @@ class projectZen extends project if(!isset($this->view->linkedProducts)) $this->view->linkedProducts = $linkedProducts; if(!isset($this->view->linkedBranches)) $this->view->linkedBranches = $linkedBranches; - - $this->display('project', 'create'); } /**