diff options
-rw-r--r-- | app/Model/ColumnMoveRestrictionModel.php | 48 | ||||
-rw-r--r-- | app/Model/ColumnRestrictionModel.php | 40 | ||||
-rw-r--r-- | app/Model/ProjectDuplicationModel.php | 2 | ||||
-rw-r--r-- | app/Model/ProjectRoleModel.php | 38 | ||||
-rw-r--r-- | app/Model/ProjectRoleRestrictionModel.php | 31 | ||||
-rw-r--r-- | app/Template/project_creation/create.php | 1 | ||||
-rw-r--r-- | app/Template/project_view/duplicate.php | 1 | ||||
-rw-r--r-- | tests/units/Model/ProjectDuplicationModelTest.php | 4 |
8 files changed, 163 insertions, 2 deletions
diff --git a/app/Model/ColumnMoveRestrictionModel.php b/app/Model/ColumnMoveRestrictionModel.php index 9d2b2842..0c337c06 100644 --- a/app/Model/ColumnMoveRestrictionModel.php +++ b/app/Model/ColumnMoveRestrictionModel.php @@ -123,4 +123,52 @@ class ColumnMoveRestrictionModel extends Base { return $this->db->table(self::TABLE)->eq('restriction_id', $restriction_id)->remove(); } + + /** + * Copy column_move_restriction models from a custome_role in the src project to the dst custom_role of the dst project + * + * @param integer $project_src_id + * @param integer $project_dst_id + * @param integer $role_src_id + * @param integer $role_dst_id + * @return boolean + */ + public function duplicate($project_src_id, $project_dst_id, $role_src_id, $role_dst_id) + { + $rows = $this->db->table(self::TABLE) + ->eq('project_id', $project_src_id) + ->eq('role_id', $role_src_id) + ->findAll(); + + foreach ($rows as $row) { + $src_column_title = $this->columnModel->getColumnTitleById($row['src_column_id']); + $dst_column_title = $this->columnModel->getColumnTitleById($row['dst_column_id']); + $src_column_id = $this->columnModel->getColumnIdByTitle($project_dst_id, $src_column_title); + $dst_column_id = $this->columnModel->getColumnIdByTitle($project_dst_id, $dst_column_title); + + if (! $dst_column_id) { + $this->logger->error("The column $dst_column_title is not present in project $project_dst_id"); + return false; + } + + if (! $src_column_id) { + $this->logger->error("The column $src_column_title is not present in project $project_dst_id"); + return false; + } + + $result = $this->db->table(self::TABLE)->persist(array( + 'project_id' => $project_dst_id, + 'role_id' => $role_dst_id, + 'src_column_id' => $row['src_column_id'], + 'dst_column_id' => $row['dst_column_id'], + 'only_assigned' => (int) $row['only_assigned'], + )); + + if (! $result) { + return false; + } + } + + return true; + } } diff --git a/app/Model/ColumnRestrictionModel.php b/app/Model/ColumnRestrictionModel.php index 92b2ac60..6c770a83 100644 --- a/app/Model/ColumnRestrictionModel.php +++ b/app/Model/ColumnRestrictionModel.php @@ -149,4 +149,44 @@ class ColumnRestrictionModel extends Base { return $this->db->table(self::TABLE)->eq('restriction_id', $restriction_id)->remove(); } + + /** + * Copy column_restriction models from a custome_role in the src project to the dst custom_role of the dst project + * + * @param integer $project_src_id + * @param integer $project_dst_id + * @param integer $role_src_id + * @param integer $role_dst_id + * @return boolean + */ + public function duplicate($project_src_id, $project_dst_id, $role_src_id, $role_dst_id) + { + $rows = $this->db->table(self::TABLE) + ->eq('project_id', $project_src_id) + ->eq('role_id', $role_src_id) + ->findAll(); + + foreach ($rows as $row) { + $column_title = $this->columnModel->getColumnTitleById($row['column_id']); + $dst_column_id = $this->columnModel->getColumnIdByTitle($project_dst_id, $column_title); + + if (! $dst_column_id) { + $this->logger->error("The column $column_title is not present in project $project_dst_id"); + return false; + } + + $result = $this->db->table(self::TABLE)->persist(array( + 'project_id' => $project_dst_id, + 'role_id' => $role_dst_id, + 'column_id' => $dst_column_id, + 'rule' => $row['rule'], + )); + + if (! $result) { + return false; + } + } + + return true; + } } diff --git a/app/Model/ProjectDuplicationModel.php b/app/Model/ProjectDuplicationModel.php index 1d1eed8e..42a4d618 100644 --- a/app/Model/ProjectDuplicationModel.php +++ b/app/Model/ProjectDuplicationModel.php @@ -24,6 +24,7 @@ class ProjectDuplicationModel extends Base { return array( 'categoryModel', + 'projectRoleModel', 'projectPermissionModel', 'actionModel', 'tagDuplicationModel', @@ -44,6 +45,7 @@ class ProjectDuplicationModel extends Base 'swimlaneModel', 'boardModel', 'categoryModel', + 'projectRoleModel', 'projectPermissionModel', 'actionModel', 'swimlaneModel', diff --git a/app/Model/ProjectRoleModel.php b/app/Model/ProjectRoleModel.php index 962ff44f..c5cd7b0e 100644 --- a/app/Model/ProjectRoleModel.php +++ b/app/Model/ProjectRoleModel.php @@ -193,4 +193,42 @@ class ProjectRoleModel extends Base $this->db->cancelTransaction(); return false; } + + /** + * Copy project custom_roles from a project to another one + * + * @param integer $project_src_id + * @param integer $project_dst_id + * @return boolean + */ + public function duplicate($project_src_id, $project_dst_id) + { + $rows = $this->db->table(self::TABLE)->eq('project_id', $project_src_id)->findAll(); + + foreach ($rows as $row) { + $role_src_id = $row['role_id']; + $role_dst_id = $this->db->table(self::TABLE)->persist(array( + 'project_id' => $project_dst_id, + 'role' => $row['role'], + )); + + if (! $role_dst_id) { + return false; + } + + if (! $this->columnRestrictionModel->duplicate($project_src_id, $project_dst_id, $role_src_id, $role_dst_id)) { + return false; + } + + if (! $this->columnMoveRestrictionModel->duplicate($project_src_id, $project_dst_id, $role_src_id, $role_dst_id)) { + return false; + } + + if (! $this->projectRoleRestrictionModel->duplicate($project_src_id, $project_dst_id, $role_src_id, $role_dst_id)) { + return false; + } + } + + return true; + } } diff --git a/app/Model/ProjectRoleRestrictionModel.php b/app/Model/ProjectRoleRestrictionModel.php index 45e7ed2f..9e5a36fa 100644 --- a/app/Model/ProjectRoleRestrictionModel.php +++ b/app/Model/ProjectRoleRestrictionModel.php @@ -133,4 +133,35 @@ class ProjectRoleRestrictionModel extends Base { return $this->db->table(self::TABLE)->eq('restriction_id', $restriction_id)->remove(); } + + /** + * Copy role restriction models from a custome_role in the src project to the dst custom_role of the dst project + * + * @param integer $project_src_id + * @param integer $project_dst_id + * @param integer $role_src_id + * @param integer $role_dst_id + * @return boolean + */ + public function duplicate($project_src_id, $project_dst_id, $role_src_id, $role_dst_id) + { + $rows = $this->db->table(self::TABLE) + ->eq('project_id', $project_src_id) + ->eq('role_id', $role_src_id) + ->findAll(); + + foreach ($rows as $row) { + $result = $this->db->table(self::TABLE)->persist(array( + 'project_id' => $project_dst_id, + 'role_id' => $role_dst_id, + 'rule' => $row['rule'], + )); + + if (! $result) { + return false; + } + } + + return true; + } } diff --git a/app/Template/project_creation/create.php b/app/Template/project_creation/create.php index 73fd4d7b..430a4bac 100644 --- a/app/Template/project_creation/create.php +++ b/app/Template/project_creation/create.php @@ -20,6 +20,7 @@ <?php if (! $is_private): ?> <?= $this->form->checkbox('projectPermissionModel', t('Permissions'), 1, true) ?> + <?= $this->form->checkbox('projectRoleModel', t('Custom roles'), 1, true) ?> <?php endif ?> <?= $this->form->checkbox('categoryModel', t('Categories'), 1, true) ?> diff --git a/app/Template/project_view/duplicate.php b/app/Template/project_view/duplicate.php index d24a52a0..e2f3677c 100644 --- a/app/Template/project_view/duplicate.php +++ b/app/Template/project_view/duplicate.php @@ -12,6 +12,7 @@ <?php if ($project['is_private'] == 0): ?> <?= $this->form->checkbox('projectPermissionModel', t('Permissions'), 1, true) ?> + <?= $this->form->checkbox('projectRoleModel', t('Custom roles'), 1, true) ?> <?php endif ?> <?= $this->form->checkbox('categoryModel', t('Categories'), 1, true) ?> diff --git a/tests/units/Model/ProjectDuplicationModelTest.php b/tests/units/Model/ProjectDuplicationModelTest.php index 8b505d2b..d27e9491 100644 --- a/tests/units/Model/ProjectDuplicationModelTest.php +++ b/tests/units/Model/ProjectDuplicationModelTest.php @@ -24,8 +24,8 @@ class ProjectDuplicationModelTest extends Base public function testGetSelections() { $projectDuplicationModel = new ProjectDuplicationModel($this->container); - $this->assertCount(6, $projectDuplicationModel->getOptionalSelection()); - $this->assertCount(9, $projectDuplicationModel->getPossibleSelection()); + $this->assertCount(7, $projectDuplicationModel->getOptionalSelection()); + $this->assertCount(10, $projectDuplicationModel->getPossibleSelection()); } public function testGetClonedProjectName() |