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

Add an ordering scope to Wiki

4-1-stable
Riyad Preukschas 2013-01-11 20:04:14 +01:00
parent 5aada8cc2a
commit 167f26b90d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/wikis_controller.rb
View File

@ -4,14 +4,14 @@ class WikisController < ProjectResourceController
before_filter :authorize_admin_wiki!, only: :destroy
def pages
@wikis = @project.wikis.group(:slug).order("created_at")
@wiki_pages = @project.wikis.group(:slug).ordered
end
def show
if params[:old_page_id]
@wiki = @project.wikis.find(params[:old_page_id])
if params[:version_id]
@wiki = @project.wikis.find(params[:version_id])
else
@wiki = @project.wikis.where(slug: params[:id]).order("created_at").last
@wiki = @project.wikis.where(slug: params[:id]).ordered.first
end
@note = @project.notes.new(noteable: @wiki)
@ -29,7 +29,7 @@ class WikisController < ProjectResourceController
end
def edit
@wiki = @project.wikis.where(slug: params[:id]).order("created_at").last
@wiki = @project.wikis.where(slug: params[:id]).ordered.first
@wiki = Wiki.regenerate_from @wiki
end
@ -47,7 +47,7 @@ class WikisController < ProjectResourceController
end
def history
@wikis = @project.wikis.where(slug: params[:id]).order("created_at")
@wiki_pages = @project.wikis.where(slug: params[:id]).ordered
end
def destroy

2
app/models/wiki.rb
View File

@ -25,6 +25,8 @@ class Wiki < ActiveRecord::Base
before_update :set_slug
scope :ordered, order("created_at DESC")
def to_param
slug
end