1
0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-01 03:57:15 +00:00

Reverts r17354 (#28829).

git-svn-id: http://svn.redmine.org/redmine/trunk@17491 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2018-09-15 09:48:54 +00:00
parent e501cb3481
commit da64eb5aca
4 changed files with 110 additions and 146 deletions

View File

@ -4,10 +4,4 @@
<%= watcher_link(@issue, User.current) %>
<%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:copy_issues, @project) && Issue.allowed_target_projects.any? %>
<%= link_to l(:button_delete), issue_path(@issue), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'icon icon-del' if @issue.deletable? %>
<%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do %>
<span class="hascontextmenu">
<%= check_box_tag("ids[]", @issue.id, false, :style => 'display:none;', :id => nil) %>
<%= link_to_context_menu %>
</span>
<% end %>
</div>
</div>

View File

@ -436,8 +436,6 @@ div.square {
.contextual .icon {padding-top: 2px; padding-bottom: 3px;}
.contextual input, .contextual select {font-size:0.9em;}
.message .contextual { margin-top: 0; }
.contextual span.hascontextmenu { background-color: transparent !important; }
.contextual span.hascontextmenu a.js-contextmenu { color: #169 !important; }
.splitcontent {overflow:auto;}
.splitcontentleft, #list-left {float:left; width:49%;}

View File

@ -624,14 +624,6 @@
float: none;
}
.contextual span.hascontextmenu a.js-contextmenu {
width: initial !important;
height: initial !important;
margin-top: 3px !important;
padding-left: 25px !important;
}
.contextual span.hascontextmenu a.js-contextmenu::after { content: ''; }
/* loading indicator */
#ajax-indicator {
width: 60%;

View File

@ -152,7 +152,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:f => ['tracker_id'],
:op => {
'tracker_id' => '='
},
},
:v => {
'tracker_id' => ['1']
}
@ -253,10 +253,10 @@ class IssuesControllerTest < Redmine::ControllerTest
:f => [filter_name],
:op => {
filter_name => '='
},
},
:v => {
filter_name => ['Foo']
},
},
:c => ['project']
}
assert_response :success
@ -1459,7 +1459,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:f => ['start_date'],
:op => {
:start_date => '='
},
},
:format => 'csv'
}
assert_equal 'text/csv', @response.content_type
@ -1573,14 +1573,6 @@ class IssuesControllerTest < Redmine::ControllerTest
end
end
assert_select 'title', :text => "Bug #1: Cannot print recipes - eCookbook - Redmine"
# action_menu for anonymous role
assert_select 'div.contextual' do
assert_select 'a[href=?]', '/issues/1/edit'
assert_select "form[data-cm-url=?]", '/issues/context_menu' do
assert_select 'span[class=?]', 'hascontextmenu'
end
end
end
def test_show_by_manager
@ -1604,18 +1596,6 @@ class IssuesControllerTest < Redmine::ControllerTest
assert_select 'textarea[name=?]', 'issue[notes]'
end
end
# action_menu for manager role
assert_select "div.contextual" do
assert_select 'a[href=?]', '/issues/1/edit'
assert_select 'a[href=?]', '/issues/1/time_entries/new'
assert_select 'a[href=?]', '/watchers/watch?object_id=1&object_type=issue'
assert_select 'a[href=?]', '/projects/ecookbook/issues/1/copy'
assert_select 'a[href=?][data-method=?]', '/issues/1', 'delete'
assert_select 'form[data-cm-url=?]', '/issues/context_menu' do
assert_select 'span[class=?]', 'hascontextmenu'
end
end
end
def test_show_should_display_update_form
@ -2684,7 +2664,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:tracker_id => 3,
:description => 'Prefilled',
:custom_field_values => {
'2' => 'Custom field value'}
'2' => 'Custom field value'}
}
}
@ -2808,7 +2788,7 @@ class IssuesControllerTest < Redmine::ControllerTest
assert !t.disabled_core_fields.include?('parent_issue_id')
get :new, :params => {
:project_id => 1, issue: { parent_issue_id: 1
:project_id => 1, issue: { parent_issue_id: 1
}
}
assert_response :success
@ -2818,7 +2798,7 @@ class IssuesControllerTest < Redmine::ControllerTest
t.save!
assert t.disabled_core_fields.include?('parent_issue_id')
get :new, :params => {
:project_id => 1, issue: { parent_issue_id: 1
:project_id => 1, issue: { parent_issue_id: 1
}
}
assert_response :success
@ -2876,7 +2856,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:issue => {
:tracker_id => 2,
:status_id => 1
},
},
:was_default_status => 1
}
assert_response :success
@ -2895,7 +2875,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:issue => {
:project_id => 1,
:fixed_version_id => ''
},
},
:form_update_triggered_by => 'issue_project_id'
}
assert_response :success
@ -2923,7 +2903,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:start_date => '2010-11-07',
:estimated_hours => '',
:custom_field_values => {
'2' => 'Value for field 2'}
'2' => 'Value for field 2'}
}
}
end
@ -2982,7 +2962,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:priority_id => 5,
:estimated_hours => '',
:custom_field_values => {
'2' => 'Value for field 2'}
'2' => 'Value for field 2'}
}
}
end
@ -3008,7 +2988,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:priority_id => 5,
:estimated_hours => '',
:custom_field_values => {
'2' => 'Value for field 2'}
'2' => 'Value for field 2'}
}
}
end
@ -3029,7 +3009,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:tracker_id => 3,
:subject => 'This is first issue',
:priority_id => 5
},
},
:continue => ''
}
end
@ -3071,7 +3051,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:description => 'This is the description',
:priority_id => 5,
:custom_field_values => {
'1' => ['', 'MySQL', 'Oracle']}
'1' => ['', 'MySQL', 'Oracle']}
}
}
end
@ -3094,7 +3074,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:description => 'This is the description',
:priority_id => 5,
:custom_field_values => {
'1' => ['']}
'1' => ['']}
}
}
end
@ -3117,7 +3097,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:description => 'This is the description',
:priority_id => 5,
:custom_field_values => {
field.id.to_s => ['', '2', '3']}
field.id.to_s => ['', '2', '3']}
}
}
end
@ -3165,8 +3145,8 @@ class IssuesControllerTest < Redmine::ControllerTest
:due_date => '',
:custom_field_values => {
cf1.id.to_s => '', cf2.id.to_s => ''
}
}
}
}
assert_response :success
@ -3195,8 +3175,8 @@ class IssuesControllerTest < Redmine::ControllerTest
:due_date => '',
:custom_field_values => {
cf1.id.to_s => '', cf2.id.to_s => ['']
}
}
}
}
assert_response :success
@ -3225,8 +3205,8 @@ class IssuesControllerTest < Redmine::ControllerTest
:due_date => '2012-07-16',
:custom_field_values => {
cf1.id.to_s => 'value1', cf2.id.to_s => 'value2'
}
}
}
}
assert_response 302
@ -3252,7 +3232,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:tracker_id => 1,
:status_id => 1,
:subject => 'Test'
}
}
assert_response 302
@ -3430,7 +3410,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:project_id => 3,
:tracker_id => 2,
:subject => 'Foo'
},
},
:continue => '1'
}
assert_redirected_to '/issues/new?issue%5Bproject_id%5D=3&issue%5Btracker_id%5D=2'
@ -3483,7 +3463,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:priority_id => 5,
:estimated_hours => '',
:custom_field_values => {
'2' => 'Value for field 2'}
'2' => 'Value for field 2'}
}
}
end
@ -3542,7 +3522,7 @@ class IssuesControllerTest < Redmine::ControllerTest
post :create, :params => {
:project_id => 1,
:issue => {
:tracker => "A param can not be a Tracker"
:tracker => "A param can not be a Tracker"
}
}
end
@ -3559,11 +3539,11 @@ class IssuesControllerTest < Redmine::ControllerTest
:project_id => 1,
:issue => {
:tracker_id => '1',
:subject => 'With attachment'
},
:subject => 'With attachment'
},
:attachments => {
'1' => {
'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'test file'}
'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'test file'}
}
}
end
@ -3594,11 +3574,11 @@ class IssuesControllerTest < Redmine::ControllerTest
:project_id => 1,
:issue => {
:tracker_id => '1',
:subject => 'With attachment'
},
:subject => 'With attachment'
},
:attachments => {
'1' => {
'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'test file'}
'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'test file'}
}
}
end
@ -3620,11 +3600,11 @@ class IssuesControllerTest < Redmine::ControllerTest
:project_id => 1,
:issue => {
:tracker_id => '1',
:subject => ''
},
:subject => ''
},
:attachments => {
'1' => {
'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'test file'}
'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'test file'}
}
}
assert_response :success
@ -3651,11 +3631,11 @@ class IssuesControllerTest < Redmine::ControllerTest
:project_id => 1,
:issue => {
:tracker_id => '1',
:subject => ''
},
:subject => ''
},
:attachments => {
'p0' => {
'token' => attachment.token}
'token' => attachment.token}
}
}
assert_response :success
@ -3677,11 +3657,11 @@ class IssuesControllerTest < Redmine::ControllerTest
:project_id => 1,
:issue => {
:tracker_id => '1',
:subject => 'Saved attachments'
},
:subject => 'Saved attachments'
},
:attachments => {
'p0' => {
'token' => attachment.token}
'token' => attachment.token}
}
}
assert_response 302
@ -4003,7 +3983,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:project_id => '1',
:tracker_id => '1',
:status_id => '1'
},
},
:was_default_status => '1'
}
end
@ -4047,7 +4027,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:tracker_id => '3',
:status_id => '1',
:subject => 'Copy with attachments'
},
},
:copy_attachments => '1'
}
end
@ -4095,7 +4075,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:tracker_id => '3',
:status_id => '1',
:subject => 'Copy with attachments'
},
},
:copy_attachments => '1',
:attachments => {
'1' => {
@ -4194,7 +4174,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:tracker_id => '3',
:status_id => '1',
:subject => 'Copy with subtasks'
},
},
:copy_subtasks => '1'
}
end
@ -4218,8 +4198,8 @@ class IssuesControllerTest < Redmine::ControllerTest
:status_id => '1',
:subject => 'Copy with subtasks',
:custom_field_values => {
'2' => 'Foo'}
},
'2' => 'Foo'}
},
:copy_subtasks => '1'
}
end
@ -4400,12 +4380,12 @@ class IssuesControllerTest < Redmine::ControllerTest
:id => 1,
:issue => {
:status_id => 5,
:priority_id => 7
},
:priority_id => 7
},
:time_entry => {
:hours => '2.5',
:comments => 'test_get_edit_with_params',
:activity_id => 10
:activity_id => 10
}
}
assert_response :success
@ -4644,7 +4624,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:project_id => '1',
:tracker_id => '2',
:priority_id => '6'
}
}
end
@ -4707,9 +4687,9 @@ class IssuesControllerTest < Redmine::ControllerTest
:issue => {
:subject => 'Custom field change',
:custom_field_values => {
'1' => ['', 'Oracle', 'PostgreSQL']
}
'1' => ['', 'Oracle', 'PostgreSQL']
}
}
}
end
@ -4730,12 +4710,12 @@ class IssuesControllerTest < Redmine::ControllerTest
:issue => {
:status_id => 2,
:assigned_to_id => 3,
:notes => 'Assigned to dlopper'
},
:notes => 'Assigned to dlopper'
},
:time_entry => {
:hours => '',
:comments => '',
:activity_id => TimeEntryActivity.first
:activity_id => TimeEntryActivity.first
}
}
end
@ -4761,7 +4741,7 @@ class IssuesControllerTest < Redmine::ControllerTest
put :update, :params => {
:id => 1,
:issue => {
:notes => notes
:notes => notes
}
}
end
@ -4829,12 +4809,12 @@ class IssuesControllerTest < Redmine::ControllerTest
put :update, :params => {
:id => 1,
:issue => {
:notes => '2.5 hours added'
},
:notes => '2.5 hours added'
},
:time_entry => {
:hours => '2.5',
:comments => 'test_put_update_with_note_and_spent_time',
:activity_id => TimeEntryActivity.first.id
:activity_id => TimeEntryActivity.first.id
}
}
end
@ -4888,10 +4868,10 @@ class IssuesControllerTest < Redmine::ControllerTest
:id => 1,
:issue => {
:notes => ''
},
},
:attachments => {
'1' => {
'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'test file'}
'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'test file'}
}
}
end
@ -4927,11 +4907,11 @@ class IssuesControllerTest < Redmine::ControllerTest
put :update, :params => {
:id => 1,
:issue => {
:subject => ''
},
:subject => ''
},
:attachments => {
'1' => {
'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'test file'}
'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'test file'}
}
}
assert_response :success
@ -4957,11 +4937,11 @@ class IssuesControllerTest < Redmine::ControllerTest
put :update, :params => {
:id => 1,
:issue => {
:subject => ''
},
:subject => ''
},
:attachments => {
'p0' => {
'token' => attachment.token}
'token' => attachment.token}
}
}
assert_response :success
@ -4984,10 +4964,10 @@ class IssuesControllerTest < Redmine::ControllerTest
:id => 1,
:issue => {
:notes => 'Attachment added'
},
},
:attachments => {
'p0' => {
'token' => attachment.token}
'token' => attachment.token}
}
}
assert_redirected_to '/issues/1'
@ -5012,10 +4992,10 @@ class IssuesControllerTest < Redmine::ControllerTest
:id => 1,
:issue => {
:notes => ''
},
},
:attachments => {
'1' => {
'file' => uploaded_test_file('testfile.txt', 'text/plain')}
'file' => uploaded_test_file('testfile.txt', 'text/plain')}
}
}
assert_redirected_to :action => 'show', :id => '1'
@ -5035,7 +5015,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:issue => {
:notes => 'Removing attachments',
:deleted_attachment_ids => ['1', '5']
}
}
end
@ -5062,7 +5042,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:subject => '',
:notes => 'Removing attachments',
:deleted_attachment_ids => ['1', '5']
}
}
end
@ -5105,7 +5085,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:subject => new_subject,
:priority_id => '6',
:category_id => '1' # no change
}
}
assert_equal 1, ActionMailer::Base.deliveries.size
@ -5121,7 +5101,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:id => 1,
:issue => {
:notes => notes
},
},
:time_entry => {
"comments"=>"", "activity_id"=>"", "hours"=>"2z"
}
@ -5143,7 +5123,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:id => 1,
:issue => {
:notes => notes
},
},
:time_entry => {
"comments"=>"this is my comment", "activity_id"=>"", "hours"=>""
}
@ -5165,7 +5145,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:id => issue.id,
:issue => {
:fixed_version_id => 4
}
}
@ -5183,8 +5163,8 @@ class IssuesControllerTest < Redmine::ControllerTest
:id => issue.id,
:issue => {
:fixed_version_id => 4
},
},
:back_url => '/issues'
}
@ -5200,8 +5180,8 @@ class IssuesControllerTest < Redmine::ControllerTest
:id => issue.id,
:issue => {
:fixed_version_id => 4
},
},
:back_url => 'http://google.com'
}
@ -5217,7 +5197,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:issue => {
:status_id => 6,
:notes => 'Notes'
},
},
:prev_issue_id => 8,
:next_issue_id => 12,
:issue_position => 2,
@ -5506,7 +5486,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:priority_id => 7,
:assigned_to_id => '',
:custom_field_values => {
'2' => ''}
'2' => ''}
}
}
@ -5536,7 +5516,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:priority_id => '',
:assigned_to_id => group.id,
:custom_field_values => {
'2' => ''}
'2' => ''}
}
}
@ -5555,7 +5535,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:priority_id => 7,
:assigned_to_id => '',
:custom_field_values => {
'2' => ''}
'2' => ''}
}
}
@ -5583,7 +5563,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:priority_id => 7,
:assigned_to_id => '',
:custom_field_values => {
'2' => ''}
'2' => ''}
}
}
assert_response 403
@ -5631,7 +5611,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:id => 1,
:issue => {
:project_id => '2'
},
},
:follow => '1'
}
assert_redirected_to '/issues/1'
@ -5643,7 +5623,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:id => [1, 2],
:issue => {
:project_id => '2'
},
},
:follow => '1'
}
assert_redirected_to '/projects/onlinestore/issues'
@ -5750,7 +5730,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:priority_id => '',
:assigned_to_id => '',
:custom_field_values => {
'2' => '777'}
'2' => '777'}
}
}
@ -5773,7 +5753,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:priority_id => '',
:assigned_to_id => '',
:custom_field_values => {
'1' => '__none__'}
'1' => '__none__'}
}
}
assert_response 302
@ -5793,7 +5773,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:priority_id => '',
:assigned_to_id => '',
:custom_field_values => {
'1' => ['MySQL', 'Oracle']}
'1' => ['MySQL', 'Oracle']}
}
}
@ -5817,7 +5797,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:priority_id => '',
:assigned_to_id => '',
:custom_field_values => {
'1' => ['__none__']}
'1' => ['__none__']}
}
}
assert_response 302
@ -5974,7 +5954,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:ids => issue_ids,
:issue => {
:project_id => '2'
},
},
:copy => '1'
}
end
@ -5996,7 +5976,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:ids => [1, 2, 3],
:issue => {
:project_id => '2'
},
},
:copy => '1'
}
assert_response 302
@ -6011,7 +5991,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:ids => [1, 2, 3],
:issue => {
:project_id => ''
},
},
:copy => '1'
}
assert_response 403
@ -6025,7 +6005,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:ids => [1, 2, 3],
:issue => {
:project_id => '1'
},
},
:copy => '1'
}
assert_response 403
@ -6052,7 +6032,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:status_id => '',
:start_date => '',
:due_date => ''
}
}
end
@ -6092,7 +6072,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:status_id => '1',
:start_date => '2009-12-01',
:due_date => '2009-12-31'
}
}
end
@ -6122,7 +6102,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:status_id => '3',
:start_date => '2009-12-01',
:due_date => '2009-12-31'
}
}
end
@ -6145,7 +6125,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:copy_attachments => '0',
:issue => {
:project_id => ''
}
}
end
@ -6165,7 +6145,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:copy_attachments => '1',
:issue => {
:project_id => ''
}
}
end
@ -6183,7 +6163,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:link_copy => '1',
:issue => {
:project_id => '1'
}
}
end
@ -6201,7 +6181,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:copy_subtasks => '0',
:issue => {
:project_id => ''
}
}
end
@ -6219,7 +6199,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:copy_subtasks => '1',
:issue => {
:project_id => ''
}
}
end
@ -6238,7 +6218,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:copy_watchers => '1',
:issue => {
:project_id => ''
}
}
end
@ -6258,7 +6238,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:copy_subtasks => '1',
:issue => {
:project_id => ''
}
}
end
@ -6273,7 +6253,7 @@ class IssuesControllerTest < Redmine::ControllerTest
:copy => '1',
:issue => {
:project_id => 2
},
},
:follow => '1'
}
issue = Issue.order('id DESC').first