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.
63 lines
1.8 KiB
JavaScript
63 lines
1.8 KiB
JavaScript
(global => {
|
||
global.gl = global.gl || {};
|
||
|
||
gl.ProtectedBranchEdit = class {
|
||
constructor(options) {
|
||
this.$wrap = options.$wrap;
|
||
this.$allowedToMergeDropdown = this.$wrap.find('.js-allowed-to-merge');
|
||
this.$allowedToPushDropdown = this.$wrap.find('.js-allowed-to-push');
|
||
|
||
this.buildDropdowns();
|
||
}
|
||
|
||
buildDropdowns() {
|
||
|
||
// Allowed to merge dropdown
|
||
new gl.ProtectedBranchAccessDropdown({
|
||
$dropdown: this.$allowedToMergeDropdown,
|
||
data: gon.merge_access_levels,
|
||
onSelect: this.onSelect.bind(this)
|
||
});
|
||
|
||
// Allowed to push dropdown
|
||
new gl.ProtectedBranchAccessDropdown({
|
||
$dropdown: this.$allowedToPushDropdown,
|
||
data: gon.push_access_levels,
|
||
onSelect: this.onSelect.bind(this)
|
||
});
|
||
}
|
||
|
||
onSelect() {
|
||
const $allowedToMergeInput = this.$wrap.find(`input[name="${this.$allowedToMergeDropdown.data('fieldName')}"]`);
|
||
const $allowedToPushInput = this.$wrap.find(`input[name="${this.$allowedToPushDropdown.data('fieldName')}"]`);
|
||
|
||
$.ajax({
|
||
type: 'POST',
|
||
url: this.$wrap.data('url'),
|
||
dataType: 'json',
|
||
data: {
|
||
_method: 'PATCH',
|
||
id: this.$wrap.data('banchId'),
|
||
protected_branch: {
|
||
merge_access_levels_attributes: [{
|
||
id: this.$allowedToMergeDropdown.data('access-level-id'),
|
||
access_level: $allowedToMergeInput.val()
|
||
}],
|
||
push_access_levels_attributes: [{
|
||
id: this.$allowedToPushDropdown.data('access-level-id'),
|
||
access_level: $allowedToPushInput.val()
|
||
}]
|
||
}
|
||
},
|
||
success: () => {
|
||
this.$wrap.effect('highlight');
|
||
},
|
||
error() {
|
||
$.scrollTo(0);
|
||
new Flash('Failed to update branch!');
|
||
}
|
||
});
|
||
}
|
||
}
|
||
|
||
})(window);
|