tsv
/
Redmine-Jobs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let subprojects view their parents’ jobs

This commit is contained in:
Trevor Vallender 2023-11-22 20:11:25 +00:00
parent 9294216abc
commit c6cb6fa64d
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/jobs_controller.rb
View File

@ -3,7 +3,7 @@ class JobsController < ApplicationController
before_action :set_job, only: [:show, :edit, :update, :destroy] before_action :set_job, only: [:show, :edit, :update, :destroy]
def index def index
@jobs = Job.all @jobs = Job.project_or_parent(@project)
end end
def show def show

1
app/models/job.rb
View File

@ -10,6 +10,7 @@ class Job < ActiveRecord::Base
has_many :time_entries has_many :time_entries
scope :project, ->(project) { where(project_id: project.id) } scope :project, ->(project) { where(project_id: project.id) }
scope :project_or_parent, ->(project) { where(project_id: [project.id, project.parent.id]) }
def total_time_logged def total_time_logged
TimeEntry.where(job_id: id) TimeEntry.where(job_id: id)

1
app/views/jobs/_form.html.erb
View File

@ -34,5 +34,4 @@
</div> </div>
<%= f.submit %> <%= f.submit %>
<%= link_to "Cancel", job_path(@job, project_id: @project.id) %>
<% end %> <% end %>

2
app/views/timelogs/_edit_form_bottom.html.erb
View File

@ -1,4 +1,4 @@
<p> <p>
<%= form.label :job_id %> <%= form.label :job_id %>
<%= form.collection_select :job_id, Job.project(@project), :id, :name %> <%= form.collection_select :job_id, Job.project_or_parent(@project), :id, :name %>
</p> </p>