From 070b61f6b7d54dc329034be3ea606c28473fbe55 Mon Sep 17 00:00:00 2001 From: Marius BALTEANU Date: Wed, 10 Feb 2021 00:12:17 +0200 Subject: [PATCH 2/3] Update log time and add notes blocks when updating the issue form --- app/views/issues/_edit.html.erb | 8 +++--- app/views/issues/edit.js.erb | 8 +----- public/javascripts/application.js | 9 +++++-- test/application_system_test_case.rb | 6 +++++ test/system/issues_test.rb | 37 ++++++++++++++++++++++++++++ 5 files changed, 55 insertions(+), 13 deletions(-) diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 33f8352f5..aca1ae8f4 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -9,8 +9,8 @@ <% end %> - <% if User.current.allowed_to?(:log_time, @project) %> -
<%= l(:button_log_time) %> + <% if User.current.allowed_to?(:log_time, @issue.project) %> +
<%= l(:button_log_time) %> <%= labelled_fields_for :time_entry, @time_entry do |time_entry| %>
@@ -28,7 +28,7 @@
<% end %> <% if @issue.notes_addable? %> -
<%= l(:field_notes) %> +
<%= l(:field_notes) %> <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :data => { :auto_complete => true @@ -43,7 +43,7 @@ <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
-
<%= l(:label_attachment_plural) %> +
<%= l(:label_attachment_plural) %> <% if @issue.attachments.any? && @issue.safe_attribute?('deleted_attachment_ids') %>
<%= link_to l(:label_edit_attachments), '#', :onclick => "$('#existing-attachments').toggle(); return false;" %>
diff --git a/app/views/issues/edit.js.erb b/app/views/issues/edit.js.erb index 8c94aeceb..ed8fc3ca8 100644 --- a/app/views/issues/edit.js.erb +++ b/app/views/issues/edit.js.erb @@ -1,7 +1 @@ -replaceIssueFormWith('<%= escape_javascript(render :partial => 'form') %>'); - -<% if User.current.allowed_to?(:log_time, @issue.project) %> - $('#log_time').show(); -<% else %> - $('#log_time').hide(); -<% end %> +replaceIssueFormWith('<%= escape_javascript(render :partial => 'edit') %>'); diff --git a/public/javascripts/application.js b/public/javascripts/application.js index feabd9ca9..84bac4cd7 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -585,8 +585,13 @@ function replaceIssueFormWith(html){ replacement.find('#'+object_id).val($(this).val()); } }); - $('#all_attributes').empty(); - $('#all_attributes').prepend(replacement); + + if ($('form.new_issue').length > 0) { + $('#all_attributes').empty(); + $('#all_attributes').prepend(replacement); + } else { + $('#issue-form').replaceWith(replacement); + } } function updateBulkEditFrom(url) { diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb index 1b117b274..99102f6a3 100644 --- a/test/application_system_test_case.rb +++ b/test/application_system_test_case.rb @@ -81,6 +81,12 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase assert_equal '/my/page', current_path end + def wait_for_ajax + Timeout.timeout(Capybara.default_max_wait_time) do + loop until page.evaluate_script("jQuery.active").zero? + end + end + def clear_downloaded_files FileUtils.rm downloaded_files end diff --git a/test/system/issues_test.rb b/test/system/issues_test.rb index f1f355d0d..6f280b2cf 100644 --- a/test/system/issues_test.rb +++ b/test/system/issues_test.rb @@ -571,4 +571,41 @@ class IssuesSystemTest < ApplicationSystemTestCase assert page.has_text? 'Related to Bug #7' end end + + def test_update_issue_form_should_include_time_entry_form_only_for_users_with_permission + log_user('jsmith', 'jsmith') + + visit '/issues/2' + page.first(:link, 'Edit').click + + # assert log time form exits for user with required permissions on the current project + assert page.has_css?('#log_time') + + # Change project to trigger an update on issue form + page.find('#issue_project_id').select('» Private child of eCookbook') + wait_for_ajax + + # assert log time form does not exist anymore for user without required permissions on the new project + assert_not page.has_css?('#log_time') + end + + def test_update_issue_form_should_include_add_notes_form_only_for_users_with_permission + log_user('jsmith', 'jsmith') + + visit '/issues/2' + page.first(:link, 'Edit').click + + # assert add notes form exits for user with required permissions on the current project + assert page.has_css?('#add_notes') + + # remove add issue notes permission from Manager role + Role.find_by_name('Manager').remove_permission! :add_issue_notes + + # Change project to trigger an update on issue form + page.find('#issue_project_id').select('» Private child of eCookbook') + wait_for_ajax + + # assert add notes form does not exist anymore for user without required permissions on the new project + assert_not page.has_css?('#add_notes') + end end -- 2.22.0