diff --git a/app/assets/javascripts/repository_columns/index.js b/app/assets/javascripts/repository_columns/index.js index 9bc7cccb1..a800b9e25 100644 --- a/app/assets/javascripts/repository_columns/index.js +++ b/app/assets/javascripts/repository_columns/index.js @@ -172,35 +172,38 @@ var RepositoryColumns = (function() { $manageModal.find('.modal-content').html(data.html) .find('#repository-column-name') .focus(); - columnType = $('#repository-column-data-type').val(); - dropdownSelector.init('#repository-column-data-type', { - noEmptyOption: true, - singleSelect: true, - closeOnSelect: true, - optionClass: 'custom-option', - selectAppearance: 'simple', - disableSearch: true - }); - dropdownSelector.init('.list-column-type .delimiter', delimiterDropdownConfig); - RepositoryListColumnType.initListDropdown(); - RepositoryListColumnType.initListPlaceholder(); + if (button.data('action') !== 'destroy') { + columnType = $('#repository-column-data-type').val(); + dropdownSelector.init('#repository-column-data-type', { + noEmptyOption: true, + singleSelect: true, + closeOnSelect: true, + optionClass: 'custom-option', + selectAppearance: 'simple', + disableSearch: true + }); - dropdownSelector.init('.checklist-column-type .delimiter', delimiterDropdownConfig); - RepositoryChecklistColumnType.initChecklistDropdown(); - RepositoryChecklistColumnType.initChecklistPlaceholder(); + dropdownSelector.init('.list-column-type .delimiter', delimiterDropdownConfig); + RepositoryListColumnType.initListDropdown(); + RepositoryListColumnType.initListPlaceholder(); - $manageModal - .trigger('columnModal::partialLoadedFor' + columnType); + dropdownSelector.init('.checklist-column-type .delimiter', delimiterDropdownConfig); + RepositoryChecklistColumnType.initChecklistDropdown(); + RepositoryChecklistColumnType.initChecklistPlaceholder(); - RepositoryStatusColumnType.updateLoadedEmojies(); + $manageModal + .trigger('columnModal::partialLoadedFor' + columnType); - if (button.data('action') === 'new') { - $('[data-column-type="RepositoryTextValue"]').show(); - $('#new-repo-column-submit').show(); - } else { - $('#update-repo-column-submit').show(); - $('[data-column-type="' + columnType + '"]').show(); + RepositoryStatusColumnType.updateLoadedEmojies(); + + if (button.data('action') === 'new') { + $('[data-column-type="RepositoryTextValue"]').show(); + $('#new-repo-column-submit').show(); + } else { + $('#update-repo-column-submit').show(); + $('[data-column-type="' + columnType + '"]').show(); + } } }).fail(function() { HelperModule.flashAlertMsg(I18n.t('libraries.repository_columns.no_permissions'), 'danger');