Commit 57271da6 authored by Valery Sizov's avatar Valery Sizov

Wiki: design fixed

parent 4c1b8558
class WikisController < ApplicationController
before_filter :project
before_filter :add_project_abilities
layout "project"
def show
......
......@@ -5,6 +5,7 @@ class Ability
when "Issue" then issue_abilities(object, subject)
when "Note" then note_abilities(object, subject)
when "Snippet" then snippet_abilities(object, subject)
when "Wiki" then wiki_abilities(object, subject)
else []
end
end
......@@ -26,12 +27,14 @@ class Ability
:write_issue,
:write_snippet,
:write_merge_request,
:write_note
:write_note,
:write_wiki
] if project.allow_write_for?(user)
rules << [
:modify_issue,
:modify_snippet,
:modify_wiki,
:admin_project,
:admin_issue,
:admin_snippet,
......@@ -48,7 +51,7 @@ class Ability
end
class << self
[:issue, :note, :snippet, :merge_request].each do |name|
[:issue, :note, :snippet, :merge_request, :wiki].each do |name|
define_method "#{name}_abilities" do |user, subject|
if subject.author == user
[
......
......@@ -6,12 +6,13 @@
- @wiki.errors.full_messages.each do |msg|
%li= msg
.field
.clearfix
= f.label :title
= f.text_field :title
.input= f.text_field :title, :class => :xxlarge
= f.hidden_field :slug
.field
.clearfix
= f.label :content
= f.text_area :content
.input= f.text_area :content, :class => :xxlarge
.actions
= f.submit 'Save'
= f.submit 'Save', :class => "primary btn"
= link_to "Cancel", project_wiki_path(@project, :index), :class => "btn"
%h1 Editing page
= render 'form'
= link_to 'Show', [@project, @wiki]
%h3
= @wiki.title
- if can? current_user, :write_wiki, @project
= link_to edit_project_wiki_path(@project, @wiki), :class => "right btn small" do
Edit
%p#notice= notice
%h3= @wiki.title
= @wiki.content
%br
= link_to 'Edit', edit_project_wiki_path(@project, @wiki)
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