diff options
author | Robert Speicher <robert@gitlab.com> | 2017-01-16 18:28:23 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-01-16 18:28:23 +0000 |
commit | 55b3ee74396799c9a847d4aef2cd9d19cfa9aed1 (patch) | |
tree | b3e7d817b617d2835ae631ba9a531080d20d1875 /app | |
parent | 0a52c40b43020bc2bd014bece02a760bfa09d15c (diff) | |
parent | 7485cec94e3bcc98880fdf51760c646a0e27c5b3 (diff) | |
download | gitlab-ce-55b3ee74396799c9a847d4aef2cd9d19cfa9aed1.tar.gz |
Merge branch 'sandish/gitlab-ce-update_ret_val' into 'master'
Ensure updating project settings shows a flash message on success
See merge request !8579
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/projects_controller.rb | 11 | ||||
-rw-r--r-- | app/services/projects/update_service.rb | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d5ee503c44c..444ff837bb3 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -42,19 +42,16 @@ class ProjectsController < Projects::ApplicationController end def update - status = ::Projects::UpdateService.new(@project, current_user, project_params).execute + result = ::Projects::UpdateService.new(@project, current_user, project_params).execute # Refresh the repo in case anything changed - @repository = project.repository + @repository = @project.repository respond_to do |format| - if status + if result[:status] == :success flash[:notice] = "Project '#{@project.name}' was successfully updated." format.html do - redirect_to( - edit_project_path(@project), - notice: "Project '#{@project.name}' was successfully updated." - ) + redirect_to(edit_project_path(@project)) end else format.html { render 'edit' } diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb index 8a6af8d8ada..842e23eb6b6 100644 --- a/app/services/projects/update_service.rb +++ b/app/services/projects/update_service.rb @@ -9,7 +9,7 @@ module Projects Gitlab::VisibilityLevel.allowed_for?(current_user, new_visibility) deny_visibility_level(project, new_visibility) - return project + return error('Visibility level unallowed') end end @@ -23,6 +23,10 @@ module Projects if project.previous_changes.include?('path') project.rename_repo end + + success + else + error('Project could not be updated') end end end |