Skip to content

Commit

Permalink
Merge pull request #2075 from MushroomObserver/njw-project-comment-fix
Browse files Browse the repository at this point in the history
Fixes error that was thrown when adding a comment to a project
  • Loading branch information
mo-nathan committed Mar 29, 2024
2 parents 0b9bc22 + 96e74e1 commit 70cf276
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/views/controllers/comments/_object.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
locals: { obs: object })

when "Project"
render(partial: "project/project", object: object)
render(partial: "projects/project", object: object)

when "SpeciesList"
render(partial: "species_lists/species_list", object: object)
Expand Down
2 changes: 1 addition & 1 deletion app/views/controllers/projects/_project.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # rendered only by comments/object ?? %>
<p><%= "#{:show_project_created_at.t}: #{project.created_at.web_time}"%></p>
<p><%= "#{:show_project_by.t}: #{user_link(project.user)}" %></p>
<p><%= "#{:show_project_by.t}: " %><%= user_link(project.user) %></p>
<p><%= "#{:show_project_user_group.t}: #{project.user_group.name.t}" %></p>
<p><%= "#{:show_project_admin_group.t}: #{project.admin_group.name.t}" %></p>
<%= (:show_project_summary.l + ": " + project.summary.to_s.html_safe).tpl %>
6 changes: 6 additions & 0 deletions test/controllers/comments_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,12 @@ def test_add_comment
assert_form_action(action: :create, target: obs_id, type: "Observation")
end

def test_add_comment_to_project
project_id = projects(:eol_project).id
requires_login(:new, target: project_id, type: "Project")
assert_form_action(action: :create, target: project_id, type: "Project")
end

def test_add_comment_no_id
login("dick")
get(:new)
Expand Down

0 comments on commit 70cf276

Please sign in to comment.