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

Bugfix: Allow time log outside of project context 

Fixes an issue where opening the log time page at the top-level causes
errors due to expecting a project to be set.

Refs #2804
This commit is contained in:
Trevor Vallender 2024-01-17 18:49:05 +00:00
parent 472d2b0479
commit 61ce2d0901
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/job.rb
View File

@ -13,7 +13,7 @@ class Job < ActiveRecord::Base
has_many :time_budgets, dependent: :destroy has_many :time_budgets, dependent: :destroy
accepts_nested_attributes_for :time_budgets, allow_destroy: true accepts_nested_attributes_for :time_budgets, allow_destroy: true
scope :project_or_parent, ->(project) { where(project_id: [project.id, project.parent&.id]) } scope :project_or_parent, ->(project) { where(project_id: [project&.id, project&.parent&.id]) }
scope :active, -> { where(starts_on: ..Date.today, ends_on: Date.today..) } scope :active, -> { where(starts_on: ..Date.today, ends_on: Date.today..) }
def with_all_time_budgets def with_all_time_budgets

7
app/views/time_entries/_edit_form_bottom.html.erb
View File

@ -1,3 +1,8 @@
<p> <p>
<%= form.label :job_id %> <%= form.label :job_id %>
<%= form.collection_select :job_id, Job.active.project_or_parent(@project), :id, :name, include_blank: true %> <% if @project.nil? %>
<%= form.collection_select :job_id, Job.active, :id, :name, include_blank: true %>
<% else %>
<%= form.collection_select :job_id, Job.active.project_or_parent(@project), :id, :name, include_blank: true %>
<% end %>
</p>