Commit 83975759 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Wiki pages page

parent 8ffb6126
...@@ -6,6 +6,10 @@ class WikisController < ApplicationController ...@@ -6,6 +6,10 @@ class WikisController < ApplicationController
before_filter :authorize_admin_wiki!, :only => :destroy before_filter :authorize_admin_wiki!, :only => :destroy
layout "project" layout "project"
def pages
@wikis = @project.wikis.group(:slug).order("created_at")
end
def show def show
if params[:old_page_id] if params[:old_page_id]
@wiki = @project.wikis.find(params[:old_page_id]) @wiki = @project.wikis.find(params[:old_page_id])
......
%h3.page_title Versions %h3.page_title
%span.cgray History for
= @wikis.last.title
%br %br
%table.admin-table %table.admin-table
%thead %thead
......
%h3.page_title All Pages
%br
%table.admin-table
%thead
%tr
%th Title
%th slug
%th created by
%tbody
- @wikis.each_with_index do |wiki_page, i|
%tr
%td
= link_to wiki_page.title, project_wiki_path(@project, wiki_page, :old_page_id => wiki_page.id)
(#{time_ago_in_words(wiki_page.created_at)}
ago)
%td= wiki_page.slug
%td= wiki_page.user.name
%h3 %h3.page_title
= @wiki.title = @wiki.title
%span.right %span.right
= link_to pages_project_wikis_path(@project), :class => "btn small grouped" do
Pages
- if can? current_user, :write_wiki, @project - if can? current_user, :write_wiki, @project
= link_to history_project_wiki_path(@project, @wiki), :class => "btn small grouped" do = link_to history_project_wiki_path(@project, @wiki), :class => "btn small grouped" do
History History
......
...@@ -98,6 +98,10 @@ Gitlab::Application.routes.draw do ...@@ -98,6 +98,10 @@ Gitlab::Application.routes.draw do
end end
resources :wikis, :only => [:show, :edit, :destroy, :create] do resources :wikis, :only => [:show, :edit, :destroy, :create] do
collection do
get :pages
end
member do member do
get "history" get "history"
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment