Skip to content
Snippets Groups Projects
Commit 4d74df25 authored by Eric Eastwood's avatar Eric Eastwood
Browse files

Fix milestone page assignees when dropped in ongoing list

parent b16730fc
No related branches found
No related tags found
No related merge requests found
Pipeline #
Loading
Loading
@@ -66,11 +66,13 @@
 
Milestone.successCallback = function(data, element) {
var img_tag;
if (data.assignee) {
img_tag = $('<img/>');
img_tag.attr('src', data.assignee.avatar_url);
img_tag.addClass('avatar s16');
$(element).find('.assignee-icon img').replaceWith(img_tag);
if (data.assignees && data.assignees.length > 0) {
data.assignees.forEach((assignee) => {
img_tag = $('<img/>');
img_tag.attr('src', assignee.avatar_url);
img_tag.addClass('avatar s16');
$(element).find('.assignee-icon').append(img_tag);
});
} else {
$(element).find('.assignee-icon').empty();
}
Loading
Loading
@@ -161,9 +163,9 @@
data = (function() {
switch (newState) {
case 'ongoing':
return opts.fieldName + '[assignee_id]=' + gon.current_user_id;
return `${opts.fieldName}[assignee_ids][]=${gon.current_user_id}`;
case 'unassigned':
return opts.fieldName + '[assignee_id]=';
return `${opts.fieldName}[assignee_ids][]=0`;
case 'closed':
return opts.fieldName + '[state_event]=close';
}
Loading
Loading
Loading
Loading
@@ -37,6 +37,13 @@ describe 'Milestone draggable', feature: true, js: true do
 
expect(issue_target).to have_selector('.issuable-row')
end
it 'assigns issue when it has been dragged to ongoing list' do
login_as(:admin)
create_and_drag_issue
expect(@issue.reload.assignees).not_to be_empty
end
end
 
context 'merge requests' do
Loading
Loading
@@ -72,7 +79,7 @@ describe 'Milestone draggable', feature: true, js: true do
end
 
def create_and_drag_issue(params = {})
create(:issue, params.merge(title: 'Foo', project: project, milestone: milestone))
@issue = create(:issue, params.merge(title: 'Foo', project: project, milestone: milestone))
 
visit namespace_project_milestone_path(project.namespace, project, milestone)
scroll_into_view('.milestone-content')
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment