Commit 3da59d91 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'remove-group-full-path-param-for-ordering' into 'master'

Remove group_full_path param when ordering issues

See merge request gitlab-org/gitlab!80180
parents c95080f0 5a9ee1f3
...@@ -544,7 +544,6 @@ export default { ...@@ -544,7 +544,6 @@ export default {
.put(joinPaths(issueToMove.webPath, 'reorder'), { .put(joinPaths(issueToMove.webPath, 'reorder'), {
move_before_id: isMovingToBeginning ? null : getIdFromGraphQLId(moveBeforeId), move_before_id: isMovingToBeginning ? null : getIdFromGraphQLId(moveBeforeId),
move_after_id: isMovingToEnd ? null : getIdFromGraphQLId(moveAfterId), move_after_id: isMovingToEnd ? null : getIdFromGraphQLId(moveAfterId),
group_full_path: this.isProject ? undefined : this.fullPath,
}) })
.then(() => { .then(() => {
const serializedVariables = JSON.stringify(this.queryVariables); const serializedVariables = JSON.stringify(this.queryVariables);
......
...@@ -7,12 +7,11 @@ import createFlash from '~/flash'; ...@@ -7,12 +7,11 @@ import createFlash from '~/flash';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
const updateIssue = (url, issueList, { move_before_id, move_after_id }) => const updateIssue = (url, { move_before_id, move_after_id }) =>
axios axios
.put(`${url}/reorder`, { .put(`${url}/reorder`, {
move_before_id, move_before_id,
move_after_id, move_after_id,
group_full_path: issueList.dataset.groupFullPath,
}) })
.catch(() => { .catch(() => {
createFlash({ createFlash({
...@@ -52,7 +51,7 @@ const initManualOrdering = () => { ...@@ -52,7 +51,7 @@ const initManualOrdering = () => {
const beforeId = prev && parseInt(prev.dataset.id, 10); const beforeId = prev && parseInt(prev.dataset.id, 10);
const afterId = next && parseInt(next.dataset.id, 10); const afterId = next && parseInt(next.dataset.id, 10);
updateIssue(url, issueList, { move_after_id: afterId, move_before_id: beforeId }); updateIssue(url, { move_after_id: afterId, move_before_id: beforeId });
}, },
}), }),
); );
......
= render 'shared/alerts/positioning_disabled' if @sort == 'relative_position' = render 'shared/alerts/positioning_disabled' if @sort == 'relative_position'
- if @issues.to_a.any? - if @issues.to_a.any?
%ul.content-list.issues-list.issuable-list{ class: issue_manual_ordering_class, data: { group_full_path: @group&.full_path } } %ul.content-list.issues-list.issuable-list{ class: issue_manual_ordering_class }
= render partial: 'projects/issues/issue', collection: @issues = render partial: 'projects/issues/issue', collection: @issues
= paginate @issues, theme: "gitlab" = paginate @issues, theme: "gitlab"
- else - else
......
...@@ -735,7 +735,6 @@ describe('CE IssuesListApp component', () => { ...@@ -735,7 +735,6 @@ describe('CE IssuesListApp component', () => {
data: JSON.stringify({ data: JSON.stringify({
move_before_id: getIdFromGraphQLId(moveBeforeId), move_before_id: getIdFromGraphQLId(moveBeforeId),
move_after_id: getIdFromGraphQLId(moveAfterId), move_after_id: getIdFromGraphQLId(moveAfterId),
group_full_path: isProject ? undefined : defaultProvide.fullPath,
}), }),
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment