Small fix for workflow tasks

This commit is contained in:
2026-04-23 14:04:47 +03:00
parent fb03bb1a2d
commit b1038c0d66
3 changed files with 9 additions and 2 deletions
@@ -8,6 +8,7 @@ module ProjectAdmin
def fetch_project
@project = Project.find_by!(code: params[:project_id])
self.current_project = @project
end
end
end
+7 -1
View File
@@ -3,6 +3,8 @@
class TasksController < ApplicationController
before_action :fetch_task, only: %w[show edit update delete change_status]
helper_method :workflows_for_tasks
def index
self.current_project = fetch_project
@tasks = if current_project
@@ -17,7 +19,7 @@ class TasksController < ApplicationController
def show; end
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
@form = Tasks::Create.new(project_id: @project.id, workflow_id: @workflow.id)
end
@@ -81,4 +83,8 @@ class TasksController < ApplicationController
@task = Task.includes(:project).find_by_full_number_or_id!(params[:id])
self.current_project = @task.project
end
def workflows_for_tasks
@project.workflows.joins(:task_statuses).distinct
end
end
+1 -1
View File
@@ -8,7 +8,7 @@ h1 New task
fieldset data={controller: 'dependent-frames-selector', 'dependent-frames-selector-param-value': 'workflow_id'}
.field
= 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'}
.field