Add approval required todos
This commit is contained in:
parent
eac0433f86
commit
d957d5f1aa
5 changed files with 14 additions and 7 deletions
|
@ -37,7 +37,7 @@ class TodosFinder
|
|||
private
|
||||
|
||||
def action_id?
|
||||
action_id.present? && [Todo::ASSIGNED, Todo::MENTIONED, Todo::BUILD_FAILED, Todo::MARKED].include?(action_id.to_i)
|
||||
action_id.present? && Todo::ACTION_NAMES.has_key?(action_id.to_i)
|
||||
end
|
||||
|
||||
def action_id
|
||||
|
|
|
@ -13,6 +13,7 @@ module TodosHelper
|
|||
when Todo::MENTIONED then 'mentioned you on'
|
||||
when Todo::BUILD_FAILED then 'The build failed for your'
|
||||
when Todo::MARKED then 'added a todo for'
|
||||
when Todo::APPROVAL_REQUIRED then 'set you as an approver for'
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -1,14 +1,16 @@
|
|||
class Todo < ActiveRecord::Base
|
||||
ASSIGNED = 1
|
||||
MENTIONED = 2
|
||||
BUILD_FAILED = 3
|
||||
MARKED = 4
|
||||
ASSIGNED = 1
|
||||
MENTIONED = 2
|
||||
BUILD_FAILED = 3
|
||||
MARKED = 4
|
||||
APPROVAL_REQUIRED = 5 # This is an EE-only feature
|
||||
|
||||
ACTION_NAMES = {
|
||||
ASSIGNED => :assigned,
|
||||
MENTIONED => :mentioned,
|
||||
BUILD_FAILED => :build_failed,
|
||||
MARKED => :marked
|
||||
MARKED => :marked,
|
||||
APPROVAL_REQUIRED => :approval_required
|
||||
}
|
||||
|
||||
belongs_to :author, class_name: "User"
|
||||
|
|
|
@ -15,7 +15,7 @@ Parameters:
|
|||
|
||||
| Attribute | Type | Required | Description |
|
||||
| --------- | ---- | -------- | ----------- |
|
||||
| `action` | string | no | The action to be filtered. Can be `assigned`, `mentioned`, `build_failed`, or `marked`. |
|
||||
| `action` | string | no | The action to be filtered. Can be `assigned`, `mentioned`, `build_failed`, `marked`, or `approval_required`. |
|
||||
| `author_id` | integer | no | The ID of an author |
|
||||
| `project_id` | integer | no | The ID of a project |
|
||||
| `state` | string | no | The state of the todo. Can be either `pending` or `done` |
|
||||
|
|
|
@ -23,6 +23,10 @@ FactoryGirl.define do
|
|||
action { Todo::BUILD_FAILED }
|
||||
end
|
||||
|
||||
trait :approval_required do
|
||||
action { Todo::APPROVAL_REQUIRED }
|
||||
end
|
||||
|
||||
trait :done do
|
||||
state :done
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue