deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1704 from riyad/small-file-edit-fixes

Browse source 
Small fixes for editing files
This commit is contained in:
Valeriy Sizov 2012-10-16 04:03:38 -07:00
commit 2a750bf2ca
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/controllers/tree_controller.rb
View file

@ -8,6 +8,7 @@ class TreeController < ProjectResourceController
before_filter :require_non_empty_project before_filter :require_non_empty_project
before_filter :assign_ref_vars before_filter :assign_ref_vars
before_filter :edit_requirements, only: [:edit, :update]
def show def show
@hex_path = Digest::SHA1.hexdigest(@path) @hex_path = Digest::SHA1.hexdigest(@path)
@ -34,10 +35,18 @@ class TreeController < ProjectResourceController
) )
if update_status if update_status
redirect_to project_tree_path(@project, @id), :notice => "File has been successfully changed" redirect_to project_tree_path(@project, @id), notice: "Your changes have been successfully commited"
else else
flash[:notice] = "You can't save file because it has been changed" flash[:notice] = "Your changes could not be commited, because the file has been changed"
render :edit render :edit
end end
end end
private
def edit_requirements
unless @tree.is_blob? && @tree.text?
redirect_to project_tree_path(@project, @id), notice: "You can only edit text files"
end
end
end end