WebEditor: sceleton

Valeriy Sizov
1 parent 02c83f12
Showing 3 changed files with 30 additions and 2 deletions Show diff stats
app/controllers/tree_controller.rb
app/views/tree/edit.html.haml
lib/gitlab/file_editor.rb
@@ -26,5 +26,13 @@ class TreeController &lt; ProjectResourceController
  
   def update
     last_commit = @project.commits(@ref, @path, 1).first.sha
+    file_editor = Gitlab::FileEditor.new(current_user, @project)
+    if file_editor.can_edit?(@path, last_commit)
+      file_editor.update(@path, params[:content])
+      redirect_to project_tree_path(@project, @id), :notice => "File has been successfully changed"
+    else
+      flash[:notice] = "You can't save file because it has been changed"
+      render :edit 
+    end
   end
 end
@@ -8,9 +8,9 @@
         #editor= @tree.data
  
     .editor-commit-comment
-      = label_tag 'text-commit' do
+      = label_tag 'commit_message' do
         %p.slead Commit message
-      = text_area_tag 'text_commit'
+      = text_area_tag 'commit_message'
     .form-actions
       = hidden_field_tag 'last_commit', @last_commit
       = hidden_field_tag 'content'
@@ -0,0 +1,20 @@
+module Gitlab
+  class FileEditor
+
+    attr_accessor :user, :project
+
+    def initialize(user, project)
+      self.user = user
+      self.project = project
+    end
+
+    def can_edit?(path, last_commit)
+      true
+    end
+
+    def update(path, content)
+      true
+    end
+
+  end
+end
...	...	@@ -26,5 +26,13 @@ class TreeController < ProjectResourceController
26	26
27	27	def update
28	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)
	31	+ file_editor.update(@path, params[:content])
	32	+ redirect_to project_tree_path(@project, @id), :notice => "File has been successfully changed"
	33	+ else
	34	+ flash[:notice] = "You can't save file because it has been changed"
	35	+ render :edit
	36	+ end
29	37	end
30	38	end
...	...
...	...	@@ -8,9 +8,9 @@
8	8	#editor= @tree.data
9	9
10	10	.editor-commit-comment
11		- = label_tag 'text-commit' do
	11	+ = label_tag 'commit_message' do
12	12	%p.slead Commit message
13		- = text_area_tag 'text_commit'
	13	+ = text_area_tag 'commit_message'
14	14	.form-actions
15	15	= hidden_field_tag 'last_commit', @last_commit
16	16	= hidden_field_tag 'content'
...	...
...	...	@@ -0,0 +1,20 @@
	1	+module Gitlab
	2	+ class FileEditor
	3	+
	4	+ attr_accessor :user, :project
	5	+
	6	+ def initialize(user, project)
	7	+ self.user = user
	8	+ self.project = project
	9	+ end
	10	+
	11	+ def can_edit?(path, last_commit)
	12	+ true
	13	+ end
	14	+
	15	+ def update(path, content)
	16	+ true
	17	+ end
	18	+
	19	+ end
	20	+end
...	...