Mention group and project name in flash messages upon create, update and delete.
This commit is contained in:
parent
82f0d3e655
commit
0fac66f84d
3 changed files with 8 additions and 7 deletions
|
@ -17,6 +17,7 @@ v 7.14.0 (unreleased)
|
|||
- Add fetch command to the MR page
|
||||
- Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
|
||||
- Add fetch command to the MR page.
|
||||
- Mention group and project name in creation, update and deletion notices (Achilleas Pipinellis)
|
||||
|
||||
v 7.13.2
|
||||
- Fix randomly failed spec
|
||||
|
|
|
@ -24,7 +24,7 @@ class GroupsController < Groups::ApplicationController
|
|||
|
||||
if @group.save
|
||||
@group.add_owner(current_user)
|
||||
redirect_to @group, notice: 'Group was successfully created.'
|
||||
redirect_to @group, notice: "Group '#{@group.name}' was successfully created."
|
||||
else
|
||||
render action: "new"
|
||||
end
|
||||
|
@ -75,7 +75,7 @@ class GroupsController < Groups::ApplicationController
|
|||
|
||||
def update
|
||||
if @group.update_attributes(group_params)
|
||||
redirect_to edit_group_path(@group), notice: 'Group was successfully updated.'
|
||||
redirect_to edit_group_path(@group), notice: "Group '#{@group.name}' was successfully updated."
|
||||
else
|
||||
render action: "edit"
|
||||
end
|
||||
|
@ -84,7 +84,7 @@ class GroupsController < Groups::ApplicationController
|
|||
def destroy
|
||||
DestroyGroupService.new(@group, current_user).execute
|
||||
|
||||
redirect_to root_path, notice: 'Group was removed.'
|
||||
redirect_to root_path, notice: "Group '#{@group.name} was deleted."
|
||||
end
|
||||
|
||||
protected
|
||||
|
|
|
@ -24,7 +24,7 @@ class ProjectsController < ApplicationController
|
|||
if @project.saved?
|
||||
redirect_to(
|
||||
project_path(@project),
|
||||
notice: 'Project was successfully created.'
|
||||
notice: "Project '#{@project.name}' was successfully created."
|
||||
)
|
||||
else
|
||||
render 'new'
|
||||
|
@ -36,11 +36,11 @@ class ProjectsController < ApplicationController
|
|||
|
||||
respond_to do |format|
|
||||
if status
|
||||
flash[:notice] = 'Project was successfully updated.'
|
||||
flash[:notice] = "Project '#{@project.name}' was successfully updated."
|
||||
format.html do
|
||||
redirect_to(
|
||||
edit_project_path(@project),
|
||||
notice: 'Project was successfully updated.'
|
||||
notice: "Project '#{@project.name}' was successfully updated."
|
||||
)
|
||||
end
|
||||
format.js
|
||||
|
@ -100,7 +100,7 @@ class ProjectsController < ApplicationController
|
|||
return access_denied! unless can?(current_user, :remove_project, @project)
|
||||
|
||||
::Projects::DestroyService.new(@project, current_user, {}).execute
|
||||
flash[:alert] = 'Project deleted.'
|
||||
flash[:alert] = "Project '#{@project.name}' was deleted."
|
||||
|
||||
if request.referer.include?('/admin')
|
||||
redirect_to admin_namespaces_projects_path
|
||||
|
|
Loading…
Reference in a new issue