Rename all models

This commit is contained in:
Frederic Guillot
2016-05-28 19:48:22 -04:00
parent 936376ffe7
commit 14713b0ec7
411 changed files with 4145 additions and 4156 deletions

View File

@@ -65,11 +65,11 @@ class CommentCreation extends Base
*/
public function doAction(array $data)
{
return (bool) $this->comment->create(array(
return (bool) $this->commentModel->create(array(
'reference' => isset($data['reference']) ? $data['reference'] : '',
'comment' => $data['comment'],
'task_id' => $data['task_id'],
'user_id' => isset($data['user_id']) && $this->projectPermission->isAssignable($this->getProjectId(), $data['user_id']) ? $data['user_id'] : 0,
'user_id' => isset($data['user_id']) && $this->projectPermissionModel->isAssignable($this->getProjectId(), $data['user_id']) ? $data['user_id'] : 0,
));
}

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Add a comment of the triggering event to the task description.
@@ -32,7 +32,7 @@ class CommentCreationMoveTaskColumn extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_MOVE_COLUMN,
TaskModel::EVENT_MOVE_COLUMN,
);
}
@@ -71,9 +71,9 @@ class CommentCreationMoveTaskColumn extends Base
return false;
}
$column = $this->column->getById($data['column_id']);
$column = $this->columnModel->getById($data['column_id']);
return (bool) $this->comment->create(array(
return (bool) $this->commentModel->create(array(
'comment' => t('Moved to column %s', $column['title']),
'task_id' => $data['task_id'],
'user_id' => $this->userSession->getId(),

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Set a category automatically according to the color
@@ -32,7 +32,7 @@ class TaskAssignCategoryColor extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_CREATE_UPDATE,
TaskModel::EVENT_CREATE_UPDATE,
);
}
@@ -78,7 +78,7 @@ class TaskAssignCategoryColor extends Base
'category_id' => $this->getParam('category_id'),
);
return $this->taskModification->update($values);
return $this->taskModificationModel->update($values);
}
/**

View File

@@ -74,7 +74,7 @@ class TaskAssignCategoryLabel extends Base
'category_id' => $this->getParam('category_id'),
);
return $this->taskModification->update($values);
return $this->taskModificationModel->update($values);
}
/**

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\TaskLink;
use Kanboard\Model\TaskLinkModel;
/**
* Set a category automatically according to a task link
@@ -33,7 +33,7 @@ class TaskAssignCategoryLink extends Base
public function getCompatibleEvents()
{
return array(
TaskLink::EVENT_CREATE_UPDATE,
TaskLinkModel::EVENT_CREATE_UPDATE,
);
}
@@ -79,7 +79,7 @@ class TaskAssignCategoryLink extends Base
'category_id' => $this->getParam('category_id'),
);
return $this->taskModification->update($values);
return $this->taskModificationModel->update($values);
}
/**
@@ -92,7 +92,7 @@ class TaskAssignCategoryLink extends Base
public function hasRequiredCondition(array $data)
{
if ($data['link_id'] == $this->getParam('link_id')) {
$task = $this->taskFinder->getById($data['task_id']);
$task = $this->taskFinderModel->getById($data['task_id']);
return empty($task['category_id']);
}

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Assign a color to a specific category
@@ -32,7 +32,7 @@ class TaskAssignColorCategory extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_CREATE_UPDATE,
TaskModel::EVENT_CREATE_UPDATE,
);
}
@@ -78,7 +78,7 @@ class TaskAssignColorCategory extends Base
'color_id' => $this->getParam('color_id'),
);
return $this->taskModification->update($values, false);
return $this->taskModificationModel->update($values, false);
}
/**

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Assign a color to a task
@@ -32,8 +32,8 @@ class TaskAssignColorColumn extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_CREATE,
Task::EVENT_MOVE_COLUMN,
TaskModel::EVENT_CREATE,
TaskModel::EVENT_MOVE_COLUMN,
);
}
@@ -79,7 +79,7 @@ class TaskAssignColorColumn extends Base
'color_id' => $this->getParam('color_id'),
);
return $this->taskModification->update($values, false);
return $this->taskModificationModel->update($values, false);
}
/**

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\TaskLink;
use Kanboard\Model\TaskLinkModel;
/**
* Assign a color to a specific task link
@@ -32,7 +32,7 @@ class TaskAssignColorLink extends Base
public function getCompatibleEvents()
{
return array(
TaskLink::EVENT_CREATE_UPDATE,
TaskLinkModel::EVENT_CREATE_UPDATE,
);
}
@@ -78,7 +78,7 @@ class TaskAssignColorLink extends Base
'color_id' => $this->getParam('color_id'),
);
return $this->taskModification->update($values, false);
return $this->taskModificationModel->update($values, false);
}
/**

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Assign a color to a priority
@@ -32,7 +32,7 @@ class TaskAssignColorPriority extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_CREATE_UPDATE,
TaskModel::EVENT_CREATE_UPDATE,
);
}
@@ -78,7 +78,7 @@ class TaskAssignColorPriority extends Base
'color_id' => $this->getParam('color_id'),
);
return $this->taskModification->update($values, false);
return $this->taskModificationModel->update($values, false);
}
/**

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Assign a color to a specific user
@@ -32,8 +32,8 @@ class TaskAssignColorUser extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_CREATE,
Task::EVENT_ASSIGNEE_CHANGE,
TaskModel::EVENT_CREATE,
TaskModel::EVENT_ASSIGNEE_CHANGE,
);
}
@@ -79,7 +79,7 @@ class TaskAssignColorUser extends Base
'color_id' => $this->getParam('color_id'),
);
return $this->taskModification->update($values, false);
return $this->taskModificationModel->update($values, false);
}
/**

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Assign a task to the logged user
@@ -32,7 +32,7 @@ class TaskAssignCurrentUser extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_CREATE,
TaskModel::EVENT_CREATE,
);
}
@@ -78,7 +78,7 @@ class TaskAssignCurrentUser extends Base
'owner_id' => $this->userSession->getId(),
);
return $this->taskModification->update($values);
return $this->taskModificationModel->update($values);
}
/**

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Assign a task to the logged user on column change
@@ -32,7 +32,7 @@ class TaskAssignCurrentUserColumn extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_MOVE_COLUMN,
TaskModel::EVENT_MOVE_COLUMN,
);
}
@@ -81,7 +81,7 @@ class TaskAssignCurrentUserColumn extends Base
'owner_id' => $this->userSession->getId(),
);
return $this->taskModification->update($values);
return $this->taskModificationModel->update($values);
}
/**

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Assign a task to a specific user
@@ -32,8 +32,8 @@ class TaskAssignSpecificUser extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_CREATE_UPDATE,
Task::EVENT_MOVE_COLUMN,
TaskModel::EVENT_CREATE_UPDATE,
TaskModel::EVENT_MOVE_COLUMN,
);
}
@@ -79,7 +79,7 @@ class TaskAssignSpecificUser extends Base
'owner_id' => $this->getParam('user_id'),
);
return $this->taskModification->update($values);
return $this->taskModificationModel->update($values);
}
/**

View File

@@ -71,7 +71,7 @@ class TaskAssignUser extends Base
'owner_id' => $data['owner_id'],
);
return $this->taskModification->update($values);
return $this->taskModificationModel->update($values);
}
/**
@@ -83,6 +83,6 @@ class TaskAssignUser extends Base
*/
public function hasRequiredCondition(array $data)
{
return $this->projectPermission->isAssignable($this->getProjectId(), $data['owner_id']);
return $this->projectPermissionModel->isAssignable($this->getProjectId(), $data['owner_id']);
}
}

View File

@@ -63,7 +63,7 @@ class TaskClose extends Base
*/
public function doAction(array $data)
{
return $this->taskStatus->close($data['task_id']);
return $this->taskStatusModel->close($data['task_id']);
}
/**

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Close automatically a task in a specific column
@@ -32,7 +32,7 @@ class TaskCloseColumn extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_MOVE_COLUMN,
TaskModel::EVENT_MOVE_COLUMN,
);
}
@@ -67,7 +67,7 @@ class TaskCloseColumn extends Base
*/
public function doAction(array $data)
{
return $this->taskStatus->close($data['task_id']);
return $this->taskStatusModel->close($data['task_id']);
}
/**

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Close automatically a task after when inactive
@@ -31,7 +31,7 @@ class TaskCloseNoActivity extends Base
*/
public function getCompatibleEvents()
{
return array(Task::EVENT_DAILY_CRONJOB);
return array(TaskModel::EVENT_DAILY_CRONJOB);
}
/**
@@ -74,7 +74,7 @@ class TaskCloseNoActivity extends Base
$duration = time() - $task['date_modification'];
if ($duration > $max) {
$results[] = $this->taskStatus->close($task['id']);
$results[] = $this->taskStatusModel->close($task['id']);
}
}

View File

@@ -66,7 +66,7 @@ class TaskCreation extends Base
*/
public function doAction(array $data)
{
return (bool) $this->taskCreation->create(array(
return (bool) $this->taskCreationModel->create(array(
'project_id' => $data['project_id'],
'title' => $data['title'],
'reference' => $data['reference'],

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Duplicate a task to another project
@@ -32,8 +32,8 @@ class TaskDuplicateAnotherProject extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_MOVE_COLUMN,
Task::EVENT_CLOSE,
TaskModel::EVENT_MOVE_COLUMN,
TaskModel::EVENT_CLOSE,
);
}
@@ -74,8 +74,8 @@ class TaskDuplicateAnotherProject extends Base
*/
public function doAction(array $data)
{
$destination_column_id = $this->column->getFirstColumnId($this->getParam('project_id'));
return (bool) $this->taskDuplication->duplicateToProject($data['task_id'], $this->getParam('project_id'), null, $destination_column_id);
$destination_column_id = $this->columnModel->getFirstColumnId($this->getParam('project_id'));
return (bool) $this->taskDuplicationModel->duplicateToProject($data['task_id'], $this->getParam('project_id'), null, $destination_column_id);
}
/**

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Email a task to someone
@@ -32,8 +32,8 @@ class TaskEmail extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_MOVE_COLUMN,
Task::EVENT_CLOSE,
TaskModel::EVENT_MOVE_COLUMN,
TaskModel::EVENT_CLOSE,
);
}
@@ -75,16 +75,16 @@ class TaskEmail extends Base
*/
public function doAction(array $data)
{
$user = $this->user->getById($this->getParam('user_id'));
$user = $this->userModel->getById($this->getParam('user_id'));
if (! empty($user['email'])) {
$task = $this->taskFinder->getDetails($data['task_id']);
$task = $this->taskFinderModel->getDetails($data['task_id']);
$this->emailClient->send(
$user['email'],
$user['name'] ?: $user['username'],
$this->getParam('subject'),
$this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->config->get('application_url')))
$this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->configModel->get('application_url')))
);
return true;

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Email a task with no activity
@@ -32,7 +32,7 @@ class TaskEmailNoActivity extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_DAILY_CRONJOB,
TaskModel::EVENT_DAILY_CRONJOB,
);
}
@@ -85,7 +85,7 @@ class TaskEmailNoActivity extends Base
{
$results = array();
$max = $this->getParam('duration') * 86400;
$user = $this->user->getById($this->getParam('user_id'));
$user = $this->userModel->getById($this->getParam('user_id'));
if (! empty($user['email'])) {
foreach ($data['tasks'] as $task) {
@@ -110,13 +110,13 @@ class TaskEmailNoActivity extends Base
*/
private function sendEmail($task_id, array $user)
{
$task = $this->taskFinder->getDetails($task_id);
$task = $this->taskFinderModel->getDetails($task_id);
$this->emailClient->send(
$user['email'],
$user['name'] ?: $user['username'],
$this->getParam('subject'),
$this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->config->get('application_url')))
$this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->configModel->get('application_url')))
);
return true;

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Move a task to another project
@@ -32,8 +32,8 @@ class TaskMoveAnotherProject extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_MOVE_COLUMN,
Task::EVENT_CLOSE,
TaskModel::EVENT_MOVE_COLUMN,
TaskModel::EVENT_CLOSE,
);
}
@@ -75,7 +75,7 @@ class TaskMoveAnotherProject extends Base
*/
public function doAction(array $data)
{
return $this->taskDuplication->moveToProject($data['task_id'], $this->getParam('project_id'));
return $this->taskDuplicationModel->moveToProject($data['task_id'], $this->getParam('project_id'));
}
/**

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Move a task to another column when an assignee is set
@@ -32,8 +32,8 @@ class TaskMoveColumnAssigned extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_ASSIGNEE_CHANGE,
Task::EVENT_UPDATE,
TaskModel::EVENT_ASSIGNEE_CHANGE,
TaskModel::EVENT_UPDATE,
);
}
@@ -75,9 +75,9 @@ class TaskMoveColumnAssigned extends Base
*/
public function doAction(array $data)
{
$original_task = $this->taskFinder->getById($data['task_id']);
$original_task = $this->taskFinderModel->getById($data['task_id']);
return $this->taskPosition->movePosition(
return $this->taskPositionModel->movePosition(
$data['project_id'],
$data['task_id'],
$this->getParam('dest_column_id'),

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Move a task to another column when the category is changed
@@ -32,7 +32,7 @@ class TaskMoveColumnCategoryChange extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_UPDATE,
TaskModel::EVENT_UPDATE,
);
}
@@ -74,9 +74,9 @@ class TaskMoveColumnCategoryChange extends Base
*/
public function doAction(array $data)
{
$original_task = $this->taskFinder->getById($data['task_id']);
$original_task = $this->taskFinderModel->getById($data['task_id']);
return $this->taskPosition->movePosition(
return $this->taskPositionModel->movePosition(
$data['project_id'],
$data['task_id'],
$this->getParam('dest_column_id'),

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Move a task to another column when an assignee is cleared
@@ -32,8 +32,8 @@ class TaskMoveColumnUnAssigned extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_ASSIGNEE_CHANGE,
Task::EVENT_UPDATE,
TaskModel::EVENT_ASSIGNEE_CHANGE,
TaskModel::EVENT_UPDATE,
);
}
@@ -75,9 +75,9 @@ class TaskMoveColumnUnAssigned extends Base
*/
public function doAction(array $data)
{
$original_task = $this->taskFinder->getById($data['task_id']);
$original_task = $this->taskFinderModel->getById($data['task_id']);
return $this->taskPosition->movePosition(
return $this->taskPositionModel->movePosition(
$data['project_id'],
$data['task_id'],
$this->getParam('dest_column_id'),

View File

@@ -63,7 +63,7 @@ class TaskOpen extends Base
*/
public function doAction(array $data)
{
return $this->taskStatus->open($data['task_id']);
return $this->taskStatusModel->open($data['task_id']);
}
/**

View File

@@ -2,7 +2,7 @@
namespace Kanboard\Action;
use Kanboard\Model\Task;
use Kanboard\Model\TaskModel;
/**
* Set the start date of task
@@ -32,7 +32,7 @@ class TaskUpdateStartDate extends Base
public function getCompatibleEvents()
{
return array(
Task::EVENT_MOVE_COLUMN,
TaskModel::EVENT_MOVE_COLUMN,
);
}
@@ -77,7 +77,7 @@ class TaskUpdateStartDate extends Base
'date_started' => time(),
);
return $this->taskModification->update($values, false);
return $this->taskModificationModel->update($values, false);
}
/**