AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug duplicate project with a too long name

This commit is contained in:
Frederic Guillot 2015-01-25 18:08:28 -05:00
parent e6cf1bf236
commit 1fc6d69e2e
7 changed files with 185 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controller/Base.php
View File

@ -36,6 +36,7 @@ use Symfony\Component\EventDispatcher\Event;
* @property \Model\Notification $notification
* @property \Model\Project $project
* @property \Model\ProjectPermission $projectPermission
* @property \Model\ProjectDuplication $projectDuplication
* @property \Model\ProjectAnalytic $projectAnalytic
* @property \Model\ProjectActivity $projectActivity
* @property \Model\ProjectDailySummary $projectDailySummary

2
app/Controller/Project.php
View File

@ -307,7 +307,7 @@ class Project extends Base
$this->checkCSRFParam();
if ($this->project->duplicate($project['id'])) {
if ($this->projectDuplication->duplicate($project['id'])) {
$this->session->flash(t('Project cloned successfully.'));
} else {
$this->session->flashError(t('Unable to clone this project.'));

1
app/Model/Base.php
View File

@ -27,6 +27,7 @@ use Pimple\Container;
* @property \Model\LastLogin $lastLogin
* @property \Model\Notification $notification
* @property \Model\Project $project
* @property \Model\ProjectDuplication $projectDuplication
* @property \Model\ProjectPermission $projectPermission
* @property \Model\SubTask $subTask
* @property \Model\SubtaskHistory $subtaskHistory

59
app/Model/Project.php
View File

@ -261,65 +261,6 @@ class Project extends Base
->filter(array($this, 'applyColumnStats'));
}
/**
* Create a project from another one.
*
* @author Antonio Rabelo
* @param integer $project_id Project Id
* @return integer Cloned Project Id
*/
public function createProjectFromAnotherProject($project_id)
{
$project = $this->getById($project_id);
$values = array(
'name' => $project['name'].' ('.t('Clone').')',
'is_active' => true,
'last_modified' => 0,
'token' => '',
'is_public' => 0,
'is_private' => empty($project['is_private']) ? 0 : 1,
);
if (! $this->db->table(self::TABLE)->save($values)) {
return 0;
}
return $this->db->getConnection()->getLastId();
}
/**
* Clone a project
*
* @author Antonio Rabelo
* @param integer $project_id Project Id
* @return integer Cloned Project Id
*/
public function duplicate($project_id)
{
$this->db->startTransaction();
// Get the cloned project Id
$clone_project_id = $this->createProjectFromAnotherProject($project_id);
if (! $clone_project_id) {
$this->db->cancelTransaction();
return false;
}
foreach (array('board', 'category', 'projectPermission', 'action') as $model) {
if (! $this->$model->duplicate($project_id, $clone_project_id)) {
$this->db->cancelTransaction();
return false;
}
}
$this->db->closeTransaction();
return (int) $clone_project_id;
}
/**
* Create a project
*

89
app/Model/ProjectDuplication.php Normal file
View File

@ -0,0 +1,89 @@
<?php
namespace Model;
/**
* Project Duplication
*
* @package model
* @author Frederic Guillot
* @author Antonio Rabelo
*/
class ProjectDuplication extends Base
{
/**
* Get a valid project name for the duplication
*
* @access public
* @param string $name Project name
* @param integer $max_length Max length allowed
* @return string
*/
public function getClonedProjectName($name, $max_length = 50)
{
$suffix = ' ('.t('Clone').')';
if (strlen($name.$suffix) > 50) {
$name = substr($name, 0, 50 - strlen($suffix));
}
return $name.$suffix;
}
/**
* Create a project from another one
*
* @param integer $project_id Project Id
* @return integer Cloned Project Id
*/
public function copy($project_id)
{
$project = $this->project->getById($project_id);
$values = array(
'name' => $this->getClonedProjectName($project['name']),
'is_active' => true,
'last_modified' => 0,
'token' => '',
'is_public' => 0,
'is_private' => empty($project['is_private']) ? 0 : 1,
);
if (! $this->db->table(Project::TABLE)->save($values)) {
return 0;
}
return $this->db->getConnection()->getLastId();
}
/**
* Clone a project with all settings
*
* @param integer $project_id Project Id
* @return integer Cloned Project Id
*/
public function duplicate($project_id)
{
$this->db->startTransaction();
// Get the cloned project Id
$clone_project_id = $this->copy($project_id);
if (! $clone_project_id) {
$this->db->cancelTransaction();
return false;
}
foreach (array('board', 'category', 'projectPermission', 'action') as $model) {
if (! $this->$model->duplicate($project_id, $clone_project_id)) {
$this->db->cancelTransaction();
return false;
}
}
$this->db->closeTransaction();
return (int) $clone_project_id;
}
}

1
app/ServiceProvider/ClassProvider.php
View File

@ -28,6 +28,7 @@ class ClassProvider implements ServiceProviderInterface
'Project',
'ProjectActivity',
'ProjectAnalytic',
'ProjectDuplication',
'ProjectDailySummary',
'ProjectPermission',
'SubTask',

96
tests/units/ProjectDuplicateTest.php → tests/units/ProjectDuplicationTest.php
View File

@ -2,9 +2,11 @@
require_once __DIR__.'/Base.php';
use Model\Action;
use Model\Project;
use Model\Category;
use Model\ProjectPermission;
use Model\ProjectDuplication;
use Model\User;
use Model\Task;
use Model\TaskCreation;
@ -13,12 +15,39 @@ use Model\Board;
class ProjectDuplicationTest extends Base
{
public function testProjectName()
{
$pd = new ProjectDuplication($this->container);
$this->assertEquals('test (Clone)', $pd->getClonedProjectName('test'));
$this->assertEquals(50, strlen($pd->getClonedProjectName(str_repeat('a', 50))));
$this->assertEquals(str_repeat('a', 42).' (Clone)', $pd->getClonedProjectName(str_repeat('a', 50)));
$this->assertEquals(50, strlen($pd->getClonedProjectName(str_repeat('a', 60))));
$this->assertEquals(str_repeat('a', 42).' (Clone)', $pd->getClonedProjectName(str_repeat('a', 60)));
}
public function testCopyProjectWithLongName()
{
$p = new Project($this->container);
$pd = new ProjectDuplication($this->container);
$this->assertEquals(1, $p->create(array('name' => str_repeat('a', 50))));
$this->assertEquals(2, $pd->duplicate(1));
$project = $p->getById(2);
$this->assertNotEmpty($project);
$this->assertEquals(str_repeat('a', 42).' (Clone)', $project['name']);
}
public function testClonePublicProject()
{
$p = new Project($this->container);
$pd = new ProjectDuplication($this->container);
$this->assertEquals(1, $p->create(array('name' => 'Public')));
$this->assertEquals(2, $p->duplicate(1));
$this->assertEquals(2, $pd->duplicate(1));
$project = $p->getById(2);
$this->assertNotEmpty($project);
@ -31,9 +60,10 @@ class ProjectDuplicationTest extends Base
public function testClonePrivateProject()
{
$p = new Project($this->container);
$pd = new ProjectDuplication($this->container);
$this->assertEquals(1, $p->create(array('name' => 'Private', 'is_private' => 1), 1, true));
$this->assertEquals(2, $p->duplicate(1));
$this->assertEquals(2, $pd->duplicate(1));
$project = $p->getById(2);
$this->assertNotEmpty($project);
@ -52,6 +82,7 @@ class ProjectDuplicationTest extends Base
{
$p = new Project($this->container);
$c = new Category($this->container);
$pd = new ProjectDuplication($this->container);
$this->assertEquals(1, $p->create(array('name' => 'P1')));
@ -59,7 +90,7 @@ class ProjectDuplicationTest extends Base
$this->assertEquals(2, $c->create(array('name' => 'C2', 'project_id' => 1)));
$this->assertEquals(3, $c->create(array('name' => 'C3', 'project_id' => 1)));
$this->assertEquals(2, $p->duplicate(1));
$this->assertEquals(2, $pd->duplicate(1));
$project = $p->getById(2);
$this->assertNotEmpty($project);
@ -85,6 +116,7 @@ class ProjectDuplicationTest extends Base
$c = new Category($this->container);
$pp = new ProjectPermission($this->container);
$u = new User($this->container);
$pd = new ProjectDuplication($this->container);
$this->assertEquals(2, $u->create(array('username' => 'unittest1', 'password' => 'unittest')));
$this->assertEquals(3, $u->create(array('username' => 'unittest2', 'password' => 'unittest')));
@ -101,7 +133,7 @@ class ProjectDuplicationTest extends Base
$this->assertTrue($pp->isManager(1, 3));
$this->assertFalse($pp->isManager(1, 4));
$this->assertEquals(2, $p->duplicate(1));
$this->assertEquals(2, $pd->duplicate(1));
$project = $p->getById(2);
$this->assertNotEmpty($project);
@ -115,4 +147,60 @@ class ProjectDuplicationTest extends Base
$this->assertTrue($pp->isManager(2, 3));
$this->assertFalse($pp->isManager(2, 4));
}
public function testCloneProjectWithActionTaskAssignCurrentUser()
{
$p = new Project($this->container);
$a = new Action($this->container);
$pd = new ProjectDuplication($this->container);
$this->assertEquals(1, $p->create(array('name' => 'P1')));
$this->assertTrue($a->create(array(
'project_id' => 1,
'event_name' => Task::EVENT_MOVE_COLUMN,
'action_name' => 'TaskAssignCurrentUser',
'params' => array('column_id' => 2),
)));
$this->assertEquals(2, $pd->duplicate(1));
$actions = $a->getAllByProject(2);
$this->assertNotEmpty($actions);
$this->assertEquals('TaskAssignCurrentUser', $actions[0]['action_name']);
$this->assertNotEmpty($actions[0]['params']);
$this->assertEquals(6, $actions[0]['params'][0]['value']);
}
public function testCloneProjectWithActionTaskAssignColorCategory()
{
$p = new Project($this->container);
$a = new Action($this->container);
$c = new Category($this->container);
$pd = new ProjectDuplication($this->container);
$this->assertEquals(1, $p->create(array('name' => 'P1')));
$this->assertEquals(1, $c->create(array('name' => 'C1', 'project_id' => 1)));
$this->assertEquals(2, $c->create(array('name' => 'C2', 'project_id' => 1)));
$this->assertEquals(3, $c->create(array('name' => 'C3', 'project_id' => 1)));
$this->assertTrue($a->create(array(
'project_id' => 1,
'event_name' => Task::EVENT_CREATE_UPDATE,
'action_name' => 'TaskAssignColorCategory',
'params' => array('color_id' => 'blue', 'category_id' => 2),
)));
$this->assertEquals(2, $pd->duplicate(1));
$actions = $a->getAllByProject(2);
$this->assertNotEmpty($actions);
$this->assertEquals('TaskAssignColorCategory', $actions[0]['action_name']);
$this->assertNotEmpty($actions[0]['params']);
$this->assertEquals('blue', $actions[0]['params'][0]['value']);
$this->assertEquals(5, $actions[0]['params'][1]['value']);
}
}