Small fix for workflow tasks
This commit is contained in:
@@ -8,6 +8,7 @@ module ProjectAdmin
|
|||||||
|
|
||||||
def fetch_project
|
def fetch_project
|
||||||
@project = Project.find_by!(code: params[:project_id])
|
@project = Project.find_by!(code: params[:project_id])
|
||||||
|
self.current_project = @project
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
class TasksController < ApplicationController
|
class TasksController < ApplicationController
|
||||||
before_action :fetch_task, only: %w[show edit update delete change_status]
|
before_action :fetch_task, only: %w[show edit update delete change_status]
|
||||||
|
|
||||||
|
helper_method :workflows_for_tasks
|
||||||
|
|
||||||
def index
|
def index
|
||||||
self.current_project = fetch_project
|
self.current_project = fetch_project
|
||||||
@tasks = if current_project
|
@tasks = if current_project
|
||||||
@@ -17,7 +19,7 @@ class TasksController < ApplicationController
|
|||||||
def show; end
|
def show; end
|
||||||
|
|
||||||
def new
|
def new
|
||||||
@project = fetch_project || Project.order(:name).first
|
@project = self.current_project = fetch_project || Project.order(:name).first
|
||||||
@workflow = fetch_workflow || @project.workflows.first
|
@workflow = fetch_workflow || @project.workflows.first
|
||||||
@form = Tasks::Create.new(project_id: @project.id, workflow_id: @workflow.id)
|
@form = Tasks::Create.new(project_id: @project.id, workflow_id: @workflow.id)
|
||||||
end
|
end
|
||||||
@@ -81,4 +83,8 @@ class TasksController < ApplicationController
|
|||||||
@task = Task.includes(:project).find_by_full_number_or_id!(params[:id])
|
@task = Task.includes(:project).find_by_full_number_or_id!(params[:id])
|
||||||
self.current_project = @task.project
|
self.current_project = @task.project
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def workflows_for_tasks
|
||||||
|
@project.workflows.joins(:task_statuses).distinct
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ h1 New task
|
|||||||
fieldset data={controller: 'dependent-frames-selector', 'dependent-frames-selector-param-value': 'workflow_id'}
|
fieldset data={controller: 'dependent-frames-selector', 'dependent-frames-selector-param-value': 'workflow_id'}
|
||||||
.field
|
.field
|
||||||
= form.label :workflow
|
= form.label :workflow
|
||||||
= form.select :workflow_id, Workflow.where(project: @form.project).map { |w| [w.name, w.id] }, {}, data: {action: 'dependent-frames-selector#refresh'}
|
= form.select :workflow_id, workflows_for_tasks.map { |w| [w.name, w.id] }, {}, data: {action: 'dependent-frames-selector#refresh'}
|
||||||
|
|
||||||
= turbo_frame_tag :status_select, data: {'dependent-frames-selector-target': 'frame'}
|
= turbo_frame_tag :status_select, data: {'dependent-frames-selector-target': 'frame'}
|
||||||
.field
|
.field
|
||||||
|
|||||||
Reference in New Issue
Block a user