Commit e6568d80 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Don't update/create projects errors were added

This could be done when a block is passed in EE.
parent 96747556
...@@ -46,6 +46,9 @@ module Projects ...@@ -46,6 +46,9 @@ module Projects
yield(@project) if block_given? yield(@project) if block_given?
# If the block added errors, don't try to save the project
return @project if @project.errors.any?
@project.creator = current_user @project.creator = current_user
if forked_from_project_id if forked_from_project_id
......
...@@ -19,6 +19,9 @@ module Projects ...@@ -19,6 +19,9 @@ module Projects
yield if block_given? yield if block_given?
# If the block added errors, don't try to save the project
return validation_failed! if project.errors.any?
if project.update_attributes(params.except(:default_branch)) if project.update_attributes(params.except(:default_branch))
if project.previous_changes.include?('path') if project.previous_changes.include?('path')
project.rename_repo project.rename_repo
...@@ -30,10 +33,7 @@ module Projects ...@@ -30,10 +33,7 @@ module Projects
success success
else else
model_errors = project.errors.full_messages.to_sentence validation_failed!
error_message = model_errors.presence || 'Project could not be updated!'
error(error_message)
end end
end end
...@@ -45,6 +45,13 @@ module Projects ...@@ -45,6 +45,13 @@ module Projects
private private
def validation_failed!
model_errors = project.errors.full_messages.to_sentence
error_message = model_errors.presence || 'Project could not be updated!'
error(error_message)
end
def renaming_project_with_container_registry_tags? def renaming_project_with_container_registry_tags?
new_path = params[:path] new_path = params[:path]
......
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