diff options
author | Jan Beckmann <king-jan1999@hotmail.de> | 2019-09-11 14:28:34 +0000 |
---|---|---|
committer | Clement Ho <408677-ClemMakesApps@users.noreply.gitlab.com> | 2019-09-11 14:28:34 +0000 |
commit | c27f619c2a7609af3a7478ae6a6e2d1f210b5be3 (patch) | |
tree | 94e426b17e66de2bfbccba59c95ec9a6d7e1f87b /app/assets/javascripts | |
parent | 0813d1543114883e8ec84cecb5495a3cd9c1f332 (diff) | |
download | gitlab-ce-c27f619c2a7609af3a7478ae6a6e2d1f210b5be3.tar.gz |
Disable "transfer group" button when no parent group is selected
Refactor project_edit.js to be reusable for this purpose
Closes #64799
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/groups/transfer_dropdown.js | 3 | ||||
-rw-r--r-- | app/assets/javascripts/pages/groups/edit/index.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/edit/index.js | 4 | ||||
-rw-r--r-- | app/assets/javascripts/transfer_edit.js (renamed from app/assets/javascripts/project_edit.js) | 6 |
4 files changed, 9 insertions, 6 deletions
diff --git a/app/assets/javascripts/groups/transfer_dropdown.js b/app/assets/javascripts/groups/transfer_dropdown.js index ce0c9256148..cec824a529c 100644 --- a/app/assets/javascripts/groups/transfer_dropdown.js +++ b/app/assets/javascripts/groups/transfer_dropdown.js @@ -14,7 +14,7 @@ export default class TransferDropdown { } buildDropdown() { - const extraOptions = [{ id: '', text: __('No parent group') }, 'divider']; + const extraOptions = [{ id: '-1', text: __('No parent group') }, 'divider']; this.groupDropdown.glDropdown({ selectable: true, @@ -33,5 +33,6 @@ export default class TransferDropdown { assignSelected(selected) { this.parentInput.val(selected.id); + this.parentInput.change(); } } diff --git a/app/assets/javascripts/pages/groups/edit/index.js b/app/assets/javascripts/pages/groups/edit/index.js index d036ff07d89..f32392c9e29 100644 --- a/app/assets/javascripts/pages/groups/edit/index.js +++ b/app/assets/javascripts/pages/groups/edit/index.js @@ -2,6 +2,7 @@ import initAvatarPicker from '~/avatar_picker'; import TransferDropdown from '~/groups/transfer_dropdown'; import initConfirmDangerModal from '~/confirm_danger_modal'; import initSettingsPanels from '~/settings_panels'; +import setupTransferEdit from '~/transfer_edit'; import dirtySubmitFactory from '~/dirty_submit/dirty_submit_factory'; import mountBadgeSettings from '~/pages/shared/mount_badge_settings'; import { GROUP_BADGE } from '~/badges/constants'; @@ -17,6 +18,7 @@ document.addEventListener('DOMContentLoaded', () => { document.querySelectorAll('.js-general-settings-form, .js-general-permissions-form'), ); mountBadgeSettings(GROUP_BADGE); + setupTransferEdit('.js-group-transfer-form', '#new_parent_group_id'); // Initialize Subgroups selector groupsSelect(); diff --git a/app/assets/javascripts/pages/projects/edit/index.js b/app/assets/javascripts/pages/projects/edit/index.js index 92ed6a652d7..c9dbe576c4b 100644 --- a/app/assets/javascripts/pages/projects/edit/index.js +++ b/app/assets/javascripts/pages/projects/edit/index.js @@ -1,6 +1,6 @@ import { PROJECT_BADGE } from '~/badges/constants'; import initSettingsPanels from '~/settings_panels'; -import setupProjectEdit from '~/project_edit'; +import setupTransferEdit from '~/transfer_edit'; import initConfirmDangerModal from '~/confirm_danger_modal'; import mountBadgeSettings from '~/pages/shared/mount_badge_settings'; import dirtySubmitFactory from '~/dirty_submit/dirty_submit_factory'; @@ -16,7 +16,7 @@ document.addEventListener('DOMContentLoaded', () => { initProjectLoadingSpinner(); initProjectPermissionsSettings(); - setupProjectEdit(); + setupTransferEdit('.js-project-transfer-form', 'select.select2'); dirtySubmitFactory( document.querySelectorAll( diff --git a/app/assets/javascripts/project_edit.js b/app/assets/javascripts/transfer_edit.js index 47bf2226781..bb15e11fd4c 100644 --- a/app/assets/javascripts/project_edit.js +++ b/app/assets/javascripts/transfer_edit.js @@ -1,8 +1,8 @@ import $ from 'jquery'; -export default function setupProjectEdit() { - const $transferForm = $('.js-project-transfer-form'); - const $selectNamespace = $transferForm.find('select.select2'); +export default function setupTransferEdit(formSelector, targetSelector) { + const $transferForm = $(formSelector); + const $selectNamespace = $transferForm.find(targetSelector); $selectNamespace.on('change', () => { $transferForm.find(':submit').prop('disabled', !$selectNamespace.val()); |