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

WebEditor: Check if save is possible

Browse source
This commit is contained in:
Valeriy Sizov 2012-10-12 14:06:12 +03:00
parent e53b47b447
commit 0b3e9fd218
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/tree_controller.rb
View file

@ -25,9 +25,8 @@ class TreeController < ProjectResourceController
end end
def update def update
last_commit = @project.commits(@ref, @path, 1).first.sha file_editor = Gitlab::FileEditor.new(current_user, @project, @ref)
file_editor = Gitlab::FileEditor.new(current_user, @project) if file_editor.can_edit?(@path, params[:last_commit])
if file_editor.can_edit?(@path, last_commit)
file_editor.update(@path, params[:content]) file_editor.update(@path, params[:content])
redirect_to project_tree_path(@project, @id), :notice => "File has been successfully changed" redirect_to project_tree_path(@project, @id), :notice => "File has been successfully changed"
else else

8
lib/gitlab/file_editor.rb
View file

@ -1,15 +1,17 @@
module Gitlab module Gitlab
class FileEditor class FileEditor
attr_accessor :user, :project attr_accessor :user, :project, :ref
def initialize(user, project) def initialize(user, project, ref)
self.user = user self.user = user
self.project = project self.project = project
self.ref = ref
end end
def can_edit?(path, last_commit) def can_edit?(path, last_commit)
true current_last_commit = @project.commits(ref, path, 1).first.sha
last_commit == current_last_commit
end end
def update(path, content) def update(path, content)