BigW Consortium Gitlab

Commit 3c91841d by James Edwards-Jones

Created ProtectedRefsController to reduce Tags/Branches duplication

Fixes ProtectedBranches#create flash errors bug due to typo in 'flash[:alert] = @protected_branches.errors'
parent 9f4b8dba
class Projects::ProtectedBranchesController < Projects::ApplicationController class Projects::ProtectedBranchesController < Projects::ProtectedRefsController
include RepositorySettingsRedirect
# Authorize
before_action :require_non_empty_project
before_action :authorize_admin_project!
before_action :load_protected_branch, only: [:show, :update, :destroy]
layout "project_settings" protected
def index def protected_ref
redirect_to_repository_settings(@project) @protected_branch
end end
def create def protected_ref=(val)
@protected_branch = ::ProtectedBranches::CreateService.new(@project, current_user, protected_branch_params).execute @protected_branch = val
unless @protected_branch.persisted?
flash[:alert] = @protected_branches.errors.full_messages.join(', ').html_safe
end
redirect_to_repository_settings(@project)
end end
def show def matching_refs=(val)
@matching_branches = @protected_branch.matching(@project.repository.branches) @matching_branches = val
end end
def update def project_refs
@protected_branch = ::ProtectedBranches::UpdateService.new(@project, current_user, protected_branch_params).execute(@protected_branch) @project.repository.branches
if @protected_branch.valid?
respond_to do |format|
format.json { render json: @protected_branch, status: :ok }
end
else
respond_to do |format|
format.json { render json: @protected_branch.errors, status: :unprocessable_entity }
end
end
end end
def destroy def create_service
@protected_branch.destroy ::ProtectedBranches::CreateService
respond_to do |format|
format.html { redirect_to_repository_settings(@project) }
format.js { head :ok }
end
end end
private def update_service
::ProtectedBranches::UpdateService
end
def load_protected_branch def load_protected_ref
@protected_branch = @project.protected_branches.find(params[:id]) self.protected_ref = @project.protected_branches.find(params[:id])
end end
def protected_branch_params def protected_ref_params
params.require(:protected_branch).permit(:name, params.require(:protected_branch).permit(:name,
merge_access_levels_attributes: [:access_level, :id], merge_access_levels_attributes: [:access_level, :id],
push_access_levels_attributes: [:access_level, :id]) push_access_levels_attributes: [:access_level, :id])
......
class Projects::ProtectedRefsController < Projects::ApplicationController
include RepositorySettingsRedirect
# Authorize
before_action :require_non_empty_project
before_action :authorize_admin_project!
before_action :load_protected_ref, only: [:show, :update, :destroy]
layout "project_settings"
def index
redirect_to_repository_settings(@project)
end
def create
self.protected_ref = create_service.new(@project, current_user, protected_ref_params).execute
unless protected_ref.persisted?
flash[:alert] = protected_ref.errors.full_messages.join(', ').html_safe
end
redirect_to_repository_settings(@project)
end
def show
self.matching_refs = protected_ref.matching(project_refs)
end
def update
self.protected_ref = update_service.new(@project, current_user, protected_ref_params).execute(protected_ref)
if protected_ref.valid?
respond_to do |format|
format.json { render json: protected_ref, status: :ok }
end
else
respond_to do |format|
format.json { render json: protected_ref.errors, status: :unprocessable_entity }
end
end
end
def destroy
protected_ref.destroy
respond_to do |format|
format.html { redirect_to_repository_settings(@project) }
format.js { head :ok }
end
end
end
class Projects::ProtectedTagsController < Projects::ApplicationController class Projects::ProtectedTagsController < Projects::ProtectedRefsController
include RepositorySettingsRedirect
# Authorize
before_action :require_non_empty_project
before_action :authorize_admin_project!
before_action :load_protected_tag, only: [:show, :update, :destroy]
layout "project_settings" protected
def index def protected_ref
redirect_to_repository_settings(@project) @protected_tag
end end
def create def protected_ref=(val)
@protected_tag = ::ProtectedTags::CreateService.new(@project, current_user, protected_tag_params).execute @protected_tag = val
unless @protected_tag.persisted?
flash[:alert] = @protected_tags.errors.full_messages.join(', ').html_safe
end
redirect_to_repository_settings(@project)
end end
def show def matching_refs=(val)
@matching_tags = @protected_tag.matching(@project.repository.tags) @matching_tags = val
end end
def update def project_refs
@protected_tag = ::ProtectedTags::UpdateService.new(@project, current_user, protected_tag_params).execute(@protected_tag) @project.repository.tags
if @protected_tag.valid?
respond_to do |format|
format.json { render json: @protected_tag, status: :ok }
end
else
respond_to do |format|
format.json { render json: @protected_tag.errors, status: :unprocessable_entity }
end
end
end end
def destroy def create_service
@protected_tag.destroy ::ProtectedTags::CreateService
respond_to do |format|
format.html { redirect_to_repository_settings(@project) }
format.js { head :ok }
end
end end
private def update_service
::ProtectedTags::UpdateService
end
def load_protected_tag def load_protected_ref
@protected_tag = @project.protected_tags.find(params[:id]) self.protected_ref = @project.protected_tags.find(params[:id])
end end
def protected_tag_params def protected_ref_params
params.require(:protected_tag).permit(:name, push_access_levels_attributes: [:access_level, :id]) params.require(:protected_tag).permit(:name, push_access_levels_attributes: [:access_level, :id])
end end
end end
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