Minor code improvements

This commit is contained in:
Frédéric Guillot
2014-05-23 10:14:25 -04:00
parent 7b53d47d46
commit db76bcb593
7 changed files with 12 additions and 17 deletions

View File

@@ -2,8 +2,7 @@ filter:
excluded_paths: excluded_paths:
- 'vendor/*' - 'vendor/*'
- 'tests/*' - 'tests/*'
- 'bin/*' - 'app/Templates/*'
- 'library/*'
paths: { } paths: { }
tools: tools:
php_sim: php_sim:
@@ -13,8 +12,7 @@ tools:
excluded_paths: excluded_paths:
- 'vendor/*' - 'vendor/*'
- 'tests/*' - 'tests/*'
- 'bin/*' - 'app/Templates/*'
- 'library/*'
paths: { } paths: { }
php_pdepend: php_pdepend:
enabled: true enabled: true
@@ -26,8 +24,7 @@ tools:
excluded_paths: excluded_paths:
- 'vendor/*' - 'vendor/*'
- 'tests/*' - 'tests/*'
- 'bin/*' - 'app/Templates/*'
- 'library/*'
paths: { } paths: { }
php_analyzer: php_analyzer:
enabled: true enabled: true
@@ -38,8 +35,7 @@ tools:
excluded_paths: excluded_paths:
- 'vendor/*' - 'vendor/*'
- 'tests/*' - 'tests/*'
- 'bin/*' - 'app/Templates/*'
- 'library/*'
paths: { } paths: { }
path_configs: { } path_configs: { }
php_changetracking: php_changetracking:
@@ -53,6 +49,5 @@ tools:
excluded_paths: excluded_paths:
- 'vendor/*' - 'vendor/*'
- 'tests/*' - 'tests/*'
- 'bin/*' - 'app/Templates/*'
- 'library/*'
paths: { } paths: { }

View File

@@ -91,7 +91,7 @@ class Action extends Base
$values = $this->request->getValues(); $values = $this->request->getValues();
list($valid, $errors) = $this->action->validateCreation($values); list($valid,) = $this->action->validateCreation($values);
if ($valid) { if ($valid) {

View File

@@ -19,10 +19,10 @@ use Model\LastLogin;
* @property \Model\Config $config * @property \Model\Config $config
* @property \Model\File $file * @property \Model\File $file
* @property \Model\Google $google * @property \Model\Google $google
* @property \Model\LastLogin $lastlogin * @property \Model\LastLogin $lastLogin
* @property \Model\Ldap $ldap * @property \Model\Ldap $ldap
* @property \Model\Project $project * @property \Model\Project $project
* @property \Model\RememberMe $rememberme * @property \Model\RememberMe $rememberMe
* @property \Model\Task $task * @property \Model\Task $task
* @property \Model\User $user * @property \Model\User $user
*/ */

View File

@@ -144,6 +144,8 @@ class Board extends Base
public function index() public function index()
{ {
$projects = $this->project->getListByStatus(ProjectModel::ACTIVE); $projects = $this->project->getListByStatus(ProjectModel::ACTIVE);
$project_id = 0;
$project_name = '';
if ($this->acl->isRegularUser()) { if ($this->acl->isRegularUser()) {
$projects = $this->project->filterListByAccess($projects, $this->acl->getUserId()); $projects = $this->project->filterListByAccess($projects, $this->acl->getUserId());

View File

@@ -46,7 +46,7 @@ class Router
{ {
$this->registry = $registry; $this->registry = $registry;
$this->controller = empty($_GET['controller']) ? $controller : $_GET['controller']; $this->controller = empty($_GET['controller']) ? $controller : $_GET['controller'];
$this->action = empty($_GET['action']) ? $controller : $_GET['action']; $this->action = empty($_GET['action']) ? $action : $_GET['action'];
} }
/** /**

View File

@@ -86,7 +86,7 @@ class File extends Base
*/ */
public function getAll($task_id) public function getAll($task_id)
{ {
return $listing = $this->db->table(self::TABLE) return $this->db->table(self::TABLE)
->eq('task_id', $task_id) ->eq('task_id', $task_id)
->asc('name') ->asc('name')
->findAll(); ->findAll();

View File

@@ -215,8 +215,6 @@ class Task extends Base
{ {
$this->db->startTransaction(); $this->db->startTransaction();
$boardModel = new Board($this->db, $this->event);
// Get the original task // Get the original task
$task = $this->getById($task_id); $task = $this->getById($task_id);