meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 03:33:07 +00:00
Code Issues Releases Wiki Activity

Merged r21578-r21580 to 5.0-stable (#37053).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21581 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2022-05-16 21:29:04 +00:00
parent da68e9dbc8
commit a25459d5d3
3 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/views/issues/edit.js.erb
View File

@ -1 +1,14 @@
replaceIssueFormWith('<%= escape_javascript(render :partial => 'edit') %>');
replaceIssueFormWith('<%= escape_javascript(render :partial => 'form') %>');
<% if User.current.allowed_to?(:log_time, @issue.project) %>
$('#log_time').show();
<% else %>
$('#log_time').hide();
<% end %>
<% if @issue.notes_addable? %>
$('#add_notes').show();
$('#add_attachments').show();
<% else %>
$('#add_notes').hide();
$('#add_attachments').hide();
<% end %>

9
public/javascripts/application.js
View File

@ -622,13 +622,8 @@ function replaceIssueFormWith(html){
replacement.find('#'+object_id).val($(this).val());
}
});
if ($('form.new_issue').length > 0) {
$('#all_attributes').empty();
$('#all_attributes').prepend(replacement);
} else {
$('#issue-form').replaceWith(replacement);
}
$('#all_attributes').empty();
$('#all_attributes').prepend(replacement);
}
function updateBulkEditFrom(url) {

20
test/system/issues_test.rb
View File

@ -256,6 +256,26 @@ class IssuesSystemTest < ApplicationSystemTestCase
assert_equal 5, issue.reload.status.id
end
def test_update_issue_with_form_update_should_keep_newly_added_attachments
set_tmp_attachments_directory
log_user('jsmith', 'jsmith')
visit '/issues/2'
page.first(:link, 'Edit').click
attach_file 'attachments[dummy][file]', Rails.root.join('test/fixtures/files/testfile.txt')
assert page.has_css?('span#attachments_1')
page.find("#issue_status_id").select("Closed")
# check that attachment still exists on the page
assert page.has_css?('span#attachments_1')
click_on 'Submit'
assert_equal 1, Issue.find(2).attachments.count
end
test "removing issue shows confirm dialog" do
log_user('jsmith', 'jsmith')
visit '/issues/1'