Wiki: history

Valery Sizov
1 parent b565cd19
Showing 7 changed files with 41 additions and 4 deletions Show diff stats
app/controllers/wikis_controller.rb
app/models/wiki.rb
app/views/wikis/history.html.haml
app/views/wikis/show.html.haml
config/routes.rb
db/migrate/20120219193300_add_user_to_wiki.rb
db/schema.rb
@@ -4,7 +4,11 @@ class WikisController &lt; ApplicationController
   layout "project"
   def show
-    @wiki = @project.wikis.where(:slug => params[:id]).order("created_at").last
+    if params[:old_page_id]
+      @wiki = @project.wikis.find(params[:old_page_id])
+    else
+      @wiki = @project.wikis.where(:slug => params[:id]).order("created_at").last
+    end
     respond_to do |format|
       if @wiki
         format.html
@@ -22,6 +26,7 @@ class WikisController &lt; ApplicationController
   def create
     @wiki = @project.wikis.new(params[:wiki])
+    @wiki.user = current_user
     respond_to do |format|
       if @wiki.save
@@ -31,6 +36,10 @@ class WikisController &lt; ApplicationController
       end
     end
   end
+
+  def history
+    @wikis = @project.wikis.where(:slug => params[:id]).order("created_at")
+  end
   def destroy
     @wiki = @project.wikis.find(params[:id])
 class Wiki < ActiveRecord::Base
   belongs_to :project
+  belongs_to :user
-  validates :content, :title, :presence => true
+  validates :content, :title, :user_id, :presence => true
   validates :title, :length => 1..250
   before_update :set_slug
@@ -0,0 +1,14 @@
+%h2 Versions
+%table
+  %thead
+    %tr
+      %th #
+      %th last edit
+      %th created by
+  %tbody
+    - @wikis.each_with_index do |wiki_page, i|
+      %tr
+        %td= i + 1
+        %td= link_to wiki_page.created_at.to_s(:short), project_wiki_path(@project, wiki_page, :old_page_id => wiki_page.id)
+        %td= wiki_page.user.name
+
 %h3
   = @wiki.title
   - if can? current_user, :write_wiki, @project
+    = link_to history_project_wiki_path(@project, @wiki), :class => "right btn small" do
+      History
     = link_to edit_project_wiki_path(@project, @wiki), :class => "right btn small" do
       Edit
@@ -56,7 +56,11 @@ Gitlab::Application.routes.draw do
       get "files"
     end
-    resources :wikis, :only => [:show, :edit, :destroy, :create]
+    resources :wikis, :only => [:show, :edit, :destroy, :create] do
+      member do
+        get "history"
+      end
+    end
     resource :repository do 
       member do 
@@ -0,0 +1,6 @@
+class AddUserToWiki < ActiveRecord::Migration
+  def change
+    add_column :wikis, :user_id, :integer
+
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120219140810) do
+ActiveRecord::Schema.define(:version => 20120219193300) do
   create_table "issues", :force => true do |t|
     t.string   "title"
@@ -166,6 +166,7 @@ ActiveRecord::Schema.define(:version =&gt; 20120219140810) do
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
     t.string   "slug"
+    t.integer  "user_id"
   end
 end
1	class Wiki < ActiveRecord::Base	1	class Wiki < ActiveRecord::Base
2	belongs_to :project	2	belongs_to :project
		3	+ belongs_to :user
3		4
4	- validates :content, :title, :presence => true	5	+ validates :content, :title, :user_id, :presence => true
5	validates :title, :length => 1..250	6	validates :title, :length => 1..250
6		7
7	before_update :set_slug	8	before_update :set_slug
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+%h2 Versions
	2	+%table
	3	+ %thead
	4	+ %tr
	5	+ %th #
	6	+ %th last edit
	7	+ %th created by
	8	+ %tbody
	9	+ - @wikis.each_with_index do \|wiki_page, i\|
	10	+ %tr
	11	+ %td= i + 1
	12	+ %td= link_to wiki_page.created_at.to_s(:short), project_wiki_path(@project, wiki_page, :old_page_id => wiki_page.id)
	13	+ %td= wiki_page.user.name
	14	+
1	%h3	1	%h3
2	= @wiki.title	2	= @wiki.title
3	- if can? current_user, :write_wiki, @project	3	- if can? current_user, :write_wiki, @project
		4	+ = link_to history_project_wiki_path(@project, @wiki), :class => "right btn small" do
		5	+ History
4	= link_to edit_project_wiki_path(@project, @wiki), :class => "right btn small" do	6	= link_to edit_project_wiki_path(@project, @wiki), :class => "right btn small" do
5	Edit	7	Edit
6		8
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+class AddUserToWiki < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :wikis, :user_id, :integer
	4	+
	5	+ end
	6	+end