Commit 0b3e9fd2189753ae4007b53c2c588fca741738ef
1 parent
e53b47b4
Exists in
master
and in
4 other branches
WebEditor: Check if save is possible
Showing
2 changed files
with
7 additions
and
6 deletions
Show diff stats
app/controllers/tree_controller.rb
@@ -25,9 +25,8 @@ class TreeController < ProjectResourceController | @@ -25,9 +25,8 @@ class TreeController < ProjectResourceController | ||
25 | end | 25 | end |
26 | 26 | ||
27 | def update | 27 | def update |
28 | - last_commit = @project.commits(@ref, @path, 1).first.sha | ||
29 | - file_editor = Gitlab::FileEditor.new(current_user, @project) | ||
30 | - if file_editor.can_edit?(@path, last_commit) | 28 | + file_editor = Gitlab::FileEditor.new(current_user, @project, @ref) |
29 | + if file_editor.can_edit?(@path, params[:last_commit]) | ||
31 | file_editor.update(@path, params[:content]) | 30 | file_editor.update(@path, params[:content]) |
32 | redirect_to project_tree_path(@project, @id), :notice => "File has been successfully changed" | 31 | redirect_to project_tree_path(@project, @id), :notice => "File has been successfully changed" |
33 | else | 32 | else |
lib/gitlab/file_editor.rb
1 | module Gitlab | 1 | module Gitlab |
2 | class FileEditor | 2 | class FileEditor |
3 | 3 | ||
4 | - attr_accessor :user, :project | 4 | + attr_accessor :user, :project, :ref |
5 | 5 | ||
6 | - def initialize(user, project) | 6 | + def initialize(user, project, ref) |
7 | self.user = user | 7 | self.user = user |
8 | self.project = project | 8 | self.project = project |
9 | + self.ref = ref | ||
9 | end | 10 | end |
10 | 11 | ||
11 | def can_edit?(path, last_commit) | 12 | def can_edit?(path, last_commit) |
12 | - true | 13 | + current_last_commit = @project.commits(ref, path, 1).first.sha |
14 | + last_commit == current_last_commit | ||
13 | end | 15 | end |
14 | 16 | ||
15 | def update(path, content) | 17 | def update(path, content) |