e805a64700
!581 has a lot of changes that would cause merge conflicts if not properly backported to CE. This commit/MR serves as a better foundation for gitlab-org/gitlab-ee!581. = Changes = 1. Move from `has_one {merge,push}_access_level` to `has_many`, with the `length` of the association limited to `1`. This is _effectively_ a `has_one` association, but should cause less conflicts with EE, which is set to `has_many`. This has a number of related changes in the views, specs, and factories. 2. Make `gon` variable loading more consistent (with EE!581) in the `ProtectedBranchesController`. Also use `::` to prefix the `ProtectedBranches` services, because this is required in EE. 3. Extract a `ProtectedBranchAccess` concern from the two access level models. This concern only has a single `humanize` method here, but will have more methods in EE. 4. Add `form_errors` to the protected branches creation form. This is not strictly required for EE compatibility, but was an oversight nonetheless.
56 lines
1.8 KiB
JavaScript
56 lines
1.8 KiB
JavaScript
(global => {
|
||
global.gl = global.gl || {};
|
||
|
||
gl.ProtectedBranchCreate = class {
|
||
constructor() {
|
||
this.$wrap = this.$form = $('#new_protected_branch');
|
||
this.buildDropdowns();
|
||
}
|
||
|
||
buildDropdowns() {
|
||
const $allowedToMergeDropdown = this.$wrap.find('.js-allowed-to-merge');
|
||
const $allowedToPushDropdown = this.$wrap.find('.js-allowed-to-push');
|
||
|
||
// Cache callback
|
||
this.onSelectCallback = this.onSelect.bind(this);
|
||
|
||
// Allowed to Merge dropdown
|
||
new gl.ProtectedBranchAccessDropdown({
|
||
$dropdown: $allowedToMergeDropdown,
|
||
data: gon.merge_access_levels,
|
||
onSelect: this.onSelectCallback
|
||
});
|
||
|
||
// Allowed to Push dropdown
|
||
new gl.ProtectedBranchAccessDropdown({
|
||
$dropdown: $allowedToPushDropdown,
|
||
data: gon.push_access_levels,
|
||
onSelect: this.onSelectCallback
|
||
});
|
||
|
||
// Select default
|
||
$allowedToPushDropdown.data('glDropdown').selectRowAtIndex(0);
|
||
$allowedToMergeDropdown.data('glDropdown').selectRowAtIndex(0);
|
||
|
||
// Protected branch dropdown
|
||
new ProtectedBranchDropdown({
|
||
$dropdown: this.$wrap.find('.js-protected-branch-select'),
|
||
onSelect: this.onSelectCallback
|
||
});
|
||
}
|
||
|
||
// This will run after clicked callback
|
||
onSelect() {
|
||
|
||
// Enable submit button
|
||
const $branchInput = this.$wrap.find('input[name="protected_branch[name]"]');
|
||
const $allowedToMergeInput = this.$wrap.find('input[name="protected_branch[merge_access_levels_attributes][0][access_level]"]');
|
||
const $allowedToPushInput = this.$wrap.find('input[name="protected_branch[push_access_levels_attributes][0][access_level]"]');
|
||
|
||
if ($branchInput.val() && $allowedToMergeInput.val() && $allowedToPushInput.val()){
|
||
this.$form.find('input[type="submit"]').removeAttr('disabled');
|
||
}
|
||
}
|
||
}
|
||
|
||
})(window);
|