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

Rename all models

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Helper/AppHelper.php
View File

@@ -22,7 +22,7 @@ class AppHelper extends Base
*/
public function config($param, $default_value = '')
{
return $this->config->get($param, $default_value);
return $this->configModel->get($param, $default_value);
}
/**
@@ -90,7 +90,7 @@ class AppHelper extends Base
*/
public function jsLang()
{
return $this->language->getJsLanguageCode();
return $this->languageModel->getJsLanguageCode();
}
/**
@@ -101,7 +101,7 @@ class AppHelper extends Base
*/
public function getTimezone()
{
return $this->timezone->getCurrentTimezone();
return $this->timezoneModel->getCurrentTimezone();
}
/**

6
app/Helper/AssetHelper.php
View File

@@ -45,8 +45,8 @@ class AssetHelper extends Base
*/
public function customCss()
{
if ($this->config->get('application_stylesheet')) {
return '<style>'.$this->config->get('application_stylesheet').'</style>';
if ($this->configModel->get('application_stylesheet')) {
return '<style>'.$this->configModel->get('application_stylesheet').'</style>';
}
return '';
@@ -60,6 +60,6 @@ class AssetHelper extends Base
*/
public function colorCss()
{
return '<style>'.$this->color->getCss().'</style>';
return '<style>'.$this->colorModel->getCss().'</style>';
}
}

4
app/Helper/CalendarHelper.php
View File

@@ -47,7 +47,7 @@ class CalendarHelper extends Base
*/
public function getTaskEvents(QueryBuilder $queryBuilder, $start, $end)
{
$startColumn = $this->config->get('calendar_project_tasks', 'date_started');
$startColumn = $this->configModel->get('calendar_project_tasks', 'date_started');
$queryBuilder->getQuery()->addCondition($this->getCalendarCondition(
$this->dateParser->getTimestampFromIsoFormat($start),
@@ -75,7 +75,7 @@ class CalendarHelper extends Base
{
$formatter = new SubtaskTimeTrackingCalendarFormatter($this->container);
return $formatter
->withQuery($this->subtaskTimeTracking->getUserQuery($user_id)
->withQuery($this->subtaskTimeTrackingModel->getUserQuery($user_id)
->addCondition($this->getCalendarCondition(
$this->dateParser->getTimestampFromIsoFormat($start),
$this->dateParser->getTimestampFromIsoFormat($end),

6
app/Helper/DateHelper.php
View File

@@ -22,7 +22,7 @@ class DateHelper extends Base
*/
public function time($value)
{
return date($this->config->get('application_time_format', 'H:i'), $value);
return date($this->configModel->get('application_time_format', 'H:i'), $value);
}
/**
@@ -42,7 +42,7 @@ class DateHelper extends Base
$value = strtotime($value);
}
return date($this->config->get('application_date_format', 'm/d/Y'), $value);
return date($this->configModel->get('application_date_format', 'm/d/Y'), $value);
}
/**
@@ -54,7 +54,7 @@ class DateHelper extends Base
*/
public function datetime($value)
{
return date($this->config->get('application_datetime_format', 'm/d/Y H:i'), $value);
return date($this->configModel->get('application_datetime_format', 'm/d/Y H:i'), $value);
}
/**

4
app/Helper/LayoutHelper.php
View File

@@ -27,7 +27,7 @@ class LayoutHelper extends Base
}
if (! isset($params['no_layout']) && ! isset($params['board_selector'])) {
$params['board_selector'] = $this->projectUserRole->getActiveProjectsByUser($this->userSession->getId());
$params['board_selector'] = $this->projectUserRoleModel->getActiveProjectsByUser($this->userSession->getId());
}
return $this->pageLayout($template, $params);
@@ -110,7 +110,7 @@ class LayoutHelper extends Base
public function config($template, array $params)
{
if (! isset($params['values'])) {
$params['values'] = $this->config->getAll();
$params['values'] = $this->configModel->getAll();
}
if (! isset($params['errors'])) {

12
app/Helper/ProjectActivityHelper.php
View File

@@ -7,7 +7,7 @@ use Kanboard\Filter\ProjectActivityProjectIdFilter;
use Kanboard\Filter\ProjectActivityProjectIdsFilter;
use Kanboard\Filter\ProjectActivityTaskIdFilter;
use Kanboard\Formatter\ProjectActivityEventFormatter;
use Kanboard\Model\ProjectActivity;
use Kanboard\Model\ProjectActivityModel;
/**
* Project Activity Helper
@@ -26,7 +26,7 @@ class ProjectActivityHelper extends Base
*/
public function searchEvents($search)
{
$projects = $this->projectUserRole->getProjectsByUser($this->userSession->getId());
$projects = $this->projectUserRoleModel->getProjectsByUser($this->userSession->getId());
$events = array();
if ($search !== '') {
@@ -34,7 +34,7 @@ class ProjectActivityHelper extends Base
$queryBuilder
->withFilter(new ProjectActivityProjectIdsFilter(array_keys($projects)))
->getQuery()
->desc(ProjectActivity::TABLE.'.id')
->desc(ProjectActivityModel::TABLE.'.id')
->limit(500)
;
@@ -58,7 +58,7 @@ class ProjectActivityHelper extends Base
->withFilter(new ProjectActivityProjectIdFilter($project_id));
$queryBuilder->getQuery()
->desc(ProjectActivity::TABLE.'.id')
->desc(ProjectActivityModel::TABLE.'.id')
->limit($limit)
;
@@ -79,7 +79,7 @@ class ProjectActivityHelper extends Base
->withFilter(new ProjectActivityProjectIdsFilter($project_ids));
$queryBuilder->getQuery()
->desc(ProjectActivity::TABLE.'.id')
->desc(ProjectActivityModel::TABLE.'.id')
->limit($limit)
;
@@ -98,7 +98,7 @@ class ProjectActivityHelper extends Base
$queryBuilder = $this->projectActivityQuery
->withFilter(new ProjectActivityTaskIdFilter($task_id));
$queryBuilder->getQuery()->desc(ProjectActivity::TABLE.'.id');
$queryBuilder->getQuery()->desc(ProjectActivityModel::TABLE.'.id');
return $queryBuilder->format(new ProjectActivityEventFormatter($this->container));
}

6
app/Helper/ProjectHeaderHelper.php
View File

@@ -48,9 +48,9 @@ class ProjectHeaderHelper extends Base
return $this->template->render('project_header/header', array(
'project' => $project,
'filters' => $filters,
'categories_list' => $this->category->getList($project['id'], false),
'users_list' => $this->projectUserRole->getAssignableUsersList($project['id'], false),
'custom_filters_list' => $this->customFilter->getAll($project['id'], $this->userSession->getId()),
'categories_list' => $this->categoryModel->getList($project['id'], false),
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], false),
'custom_filters_list' => $this->customFilterModel->getAll($project['id'], $this->userSession->getId()),
'board_view' => $boardView,
));
}

16
app/Helper/TaskHelper.php
View File

@@ -22,22 +22,22 @@ class TaskHelper extends Base
public function getColors()
{
return $this->color->getList();
return $this->colorModel->getList();
}
public function recurrenceTriggers()
{
return $this->task->getRecurrenceTriggerList();
return $this->taskModel->getRecurrenceTriggerList();
}
public function recurrenceTimeframes()
{
return $this->task->getRecurrenceTimeframeList();
return $this->taskModel->getRecurrenceTimeframeList();
}
public function recurrenceBasedates()
{
return $this->task->getRecurrenceBasedateList();
return $this->taskModel->getRecurrenceBasedateList();
}
public function canRemove(array $task)
@@ -142,7 +142,7 @@ class TaskHelper extends Base
public function selectStartDate(array $values, array $errors = array(), array $attributes = array())
{
$placeholder = date($this->config->get('application_date_format', 'm/d/Y H:i'));
$placeholder = date($this->configModel->get('application_date_format', 'm/d/Y H:i'));
$attributes = array_merge(array('tabindex="11"', 'placeholder="'.$placeholder.'"'), $attributes);
$html = $this->helper->form->label(t('Start Date'), 'date_started');
@@ -153,7 +153,7 @@ class TaskHelper extends Base
public function selectDueDate(array $values, array $errors = array(), array $attributes = array())
{
$placeholder = date($this->config->get('application_date_format', 'm/d/Y'));
$placeholder = date($this->configModel->get('application_date_format', 'm/d/Y'));
$attributes = array_merge(array('tabindex="12"', 'placeholder="'.$placeholder.'"'), $attributes);
$html = $this->helper->form->label(t('Due Date'), 'date_due');
@@ -178,9 +178,9 @@ class TaskHelper extends Base
public function getProgress($task)
{
if (! isset($this->columns[$task['project_id']])) {
$this->columns[$task['project_id']] = $this->column->getList($task['project_id']);
$this->columns[$task['project_id']] = $this->columnModel->getList($task['project_id']);
}
return $this->task->getProgress($task, $this->columns[$task['project_id']]);
return $this->taskModel->getProgress($task, $this->columns[$task['project_id']]);
}
}

2
app/Helper/UrlHelper.php
View File

@@ -109,7 +109,7 @@ class UrlHelper extends Base
public function base()
{
if (empty($this->base)) {
$this->base = $this->config->get('application_url') ?: $this->server();
$this->base = $this->configModel->get('application_url') ?: $this->server();
}
return $this->base;

6
app/Helper/UserHelper.php
View File

@@ -21,7 +21,7 @@ class UserHelper extends Base
*/
public function hasNotifications()
{
return $this->userUnreadNotification->hasNotifications($this->userSession->getId());
return $this->userUnreadNotificationModel->hasNotifications($this->userSession->getId());
}
/**
@@ -50,7 +50,7 @@ class UserHelper extends Base
*/
public function getFullname(array $user = array())
{
return $this->user->getFullname(empty($user) ? $this->userSession->getAll() : $user);
return $this->userModel->getFullname(empty($user) ? $this->userSession->getAll() : $user);
}
/**
@@ -157,7 +157,7 @@ class UserHelper extends Base
*/
public function getProjectUserRole($project_id)
{
return $this->memoryCache->proxy($this->projectUserRole, 'getUserRole', $project_id, $this->userSession->getId());
return $this->memoryCache->proxy($this->projectUserRoleModel, 'getUserRole', $project_id, $this->userSession->getId());
}
/**