summaryrefslogtreecommitdiff
path: root/app/Model
diff options
context:
space:
mode:
Diffstat (limited to 'app/Model')
-rw-r--r--app/Model/Comment.php1
-rw-r--r--app/Model/ProjectPermission.php2
-rw-r--r--app/Model/ProjectUserRole.php14
3 files changed, 15 insertions, 2 deletions
diff --git a/app/Model/Comment.php b/app/Model/Comment.php
index c7125a25..f60a96e3 100644
--- a/app/Model/Comment.php
+++ b/app/Model/Comment.php
@@ -203,6 +203,7 @@ class Comment extends Base
new Validators\Integer('id', t('This value must be an integer')),
new Validators\Integer('task_id', t('This value must be an integer')),
new Validators\Integer('user_id', t('This value must be an integer')),
+ new Validators\MaxLength('reference', t('The maximum length is %d characters', 50), 50),
new Validators\Required('comment', t('Comment is required'))
);
}
diff --git a/app/Model/ProjectPermission.php b/app/Model/ProjectPermission.php
index f74b8587..4ad9bbf1 100644
--- a/app/Model/ProjectPermission.php
+++ b/app/Model/ProjectPermission.php
@@ -100,7 +100,7 @@ class ProjectPermission extends Base
*/
public function getActiveProjectIds($user_id)
{
- return array_keys($this->projectUserRole->getProjectsByUser($user_id, array(Project::ACTIVE)));
+ return array_keys($this->projectUserRole->getActiveProjectsByUser($user_id));
}
/**
diff --git a/app/Model/ProjectUserRole.php b/app/Model/ProjectUserRole.php
index 28e6c8c6..b2c38622 100644
--- a/app/Model/ProjectUserRole.php
+++ b/app/Model/ProjectUserRole.php
@@ -20,7 +20,19 @@ class ProjectUserRole extends Base
const TABLE = 'project_has_users';
/**
- * Get the list of project visible by the given user
+ * Get the list of active project for the given user
+ *
+ * @access public
+ * @param integer $user_id
+ * @return array
+ */
+ public function getActiveProjectsByUser($user_id)
+ {
+ return $this->getProjectsByUser($user_id, $status = array(Project::ACTIVE));
+ }
+
+ /**
+ * Get the list of project visible for the given user
*
* @access public
* @param integer $user_id