diff --git a/module/my/css/project.css b/module/my/css/project.css
index 7dd4be4654..9b0bf46e28 100644
--- a/module/my/css/project.css
+++ b/module/my/css/project.css
@@ -2,6 +2,7 @@
#projectList .c-actions {overflow: visible;}
#projectTableList > tr:last-child .c-actions .dropdown-menu {top: auto; bottom: 100%; margin-bottom: -5px;}
-.c-budget {width: 100px;}
+.c-date {width: 80px;}
+.c-budget {width: 80px;}
.label-warning, .label-info {width: 60px !important;}
.project-type-label.label-outline {width: 50px; min-width: 50px;}
diff --git a/module/my/css/project.en.css b/module/my/css/project.en.css
index 571f6926a8..1948d1949e 100644
--- a/module/my/css/project.en.css
+++ b/module/my/css/project.en.css
@@ -1 +1,2 @@
.c-begin {width: 120px;}
+.c-end {width: 100px;}
diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php
index 724d7e38e0..0f6bbd5308 100644
--- a/module/my/view/project.html.php
+++ b/module/my/view/project.html.php
@@ -40,7 +40,7 @@
project->status);?> |
project->begin);?> |
- project->end);?> |
+ project->end);?> |
project->budget);?> |
project->PM);?> |
actions;?> |
diff --git a/test/class/group.class.php b/test/class/group.class.php
index 2f64bae404..82633270ec 100755
--- a/test/class/group.class.php
+++ b/test/class/group.class.php
@@ -56,13 +56,20 @@ class groupTest
* @access public
* @return void
*/
- public function copyTest($groupID)
+ public function copyTest($groupID, $param)
{
+ foreach($param as $k => $v) $_POST[$k] = $v;
+
$objects = $this->objectModel->copy($groupID);
+ unset($_POST);
if(dao::isError()) return dao::getError();
- return $objects;
+ $newGroupID = $this->objectModel->dao->lastInsertID();
+ $object = $this->objectModel->getByID($newGroupID);
+
+ $this->objectModel->delete($newGroupID);
+ return $object;
}
/**
@@ -79,7 +86,22 @@ class groupTest
if(dao::isError()) return dao::getError();
- return $objects;
+ $fromPrivs = $this->objectModel->getPrivs($fromGroup);
+ $toPrivs = $this->objectModel->getPrivs($toGroup);
+
+ $result = true;
+ foreach($fromPrivs as $group => $privs)
+ {
+ foreach($privs as $key => $priv)
+ {
+ if(!isset($toPrivs[$group][$key]) or $toPrivs[$group][$key] != $fromPrivs[$group][$key])
+ {
+ $result = false;
+ break;
+ }
+ }
+ }
+ return $result;
}
/**
@@ -96,7 +118,19 @@ class groupTest
if(dao::isError()) return dao::getError();
- return $objects;
+ $fromUsers = $this->objectModel->getUserPairs($fromGroup);
+ $toUsers = $this->objectModel->getUserPairs($toGroup);
+
+ $result = true;
+ foreach($fromUsers as $account => $name)
+ {
+ if(!isset($toUsers[$account]) or $toUsers[$account] != $fromUsers[$account])
+ {
+ $result = false;
+ break;
+ }
+ }
+ return $result;
}
/**
@@ -268,11 +302,11 @@ class groupTest
*/
public function deleteTest($groupID, $null = null)
{
- $objects = $this->objectModel->delete($groupID, $null = null);
+ $this->objectModel->delete($groupID, $null = null);
if(dao::isError()) return dao::getError();
- return $objects;
+ return true;
}
/**
diff --git a/test/model/group/copy.php b/test/model/group/copy.php
index 804d3dd221..756998f97a 100644
--- a/test/model/group/copy.php
+++ b/test/model/group/copy.php
@@ -10,8 +10,16 @@ title=测试 groupModel->copy();
cid=1
pid=1
+复制id为2的分组 >> 这是一个复制的分组
+复制名字已存在的分组 >> 『分组名称』已经有『我是一个分组』这条记录了。如果您确定该记录已删除,请到后台-系统-数据-回收站还原。
+
*/
-$group = new groupTest();
+$groupID = 2;
-r($group->copyTest()) && p() && e();
\ No newline at end of file
+$data = array('name' => '这是一个复制的分组');
+$existData = array('name' => '我是一个分组');
+
+$group = new groupTest();
+r($group->copyTest($groupID, $data)) && p('name') && e('这是一个复制的分组'); // 这是一个复制的分组
+r($group->copyTest($groupID, $existData)) && p('name:0') && e('『分组名称』已经有『我是一个分组』这条记录了。如果您确定该记录已删除,请到后台-系统-数据-回收站还原。'); // 『分组名称』已经有『我是一个分组』这条记录了。如果您确定该记录已删除,请到后台-系统-数据-回收站还原。
diff --git a/test/model/group/copypriv.php b/test/model/group/copypriv.php
index df9a1ea721..d98fb151ba 100644
--- a/test/model/group/copypriv.php
+++ b/test/model/group/copypriv.php
@@ -10,8 +10,12 @@ title=测试 groupModel->copyPriv();
cid=1
pid=1
+复制分组6权限到分组7 >> 1
+
*/
-$group = new groupTest();
+$fromGroup = 6;
+$toGroup = 7;
-r($group->copyPrivTest()) && p() && e();
\ No newline at end of file
+$group = new groupTest();
+r($group->copyPrivTest($fromGroup, $toGroup)) && p() && e('1'); // 复制分组6权限到分组7
diff --git a/test/model/group/copyuser.php b/test/model/group/copyuser.php
index 471519d875..8e5e8171b3 100644
--- a/test/model/group/copyuser.php
+++ b/test/model/group/copyuser.php
@@ -10,8 +10,14 @@ title=测试 groupModel->copyUser();
cid=1
pid=1
+复制分组6用户到分组7 >> 1
+
*/
+$fromGroup = 6;
+$toGroup = 7;
+
$group = new groupTest();
-r($group->copyUserTest()) && p() && e();
\ No newline at end of file
+r($group->copyUserTest($fromGroup, $toGroup)) && p() && e('1'); // 复制分组6用户到分组7
+system("./ztest init");
diff --git a/test/model/group/delete.php b/test/model/group/delete.php
index 9ea473d918..2e14d9c5fd 100644
--- a/test/model/group/delete.php
+++ b/test/model/group/delete.php
@@ -10,8 +10,14 @@ title=测试 groupModel->delete();
cid=1
pid=1
+删除id为10的组 >> 1
+删除id为0的组 >> 1
+
*/
-$group = new groupTest();
+$groupID = 10;
-r($group->deleteTest()) && p() && e();
\ No newline at end of file
+$group = new groupTest();
+r($group->deleteTest($groupID)) && p() && e('1'); // 删除id为10的组
+r($group->deleteTest(0)) && p() && e('1'); // 删除id为0的组
+system("./ztest init");