jro_apps/redmine Commit - r3518:58792737394c

Makes the wiki sidebar editable (#5208)....

Jean-Philippe Lang -

r3518:58792737394c

parent child

Context file:

r3518:58792737394c

app/controllers/wiki_controller.rb +1 -1

                 page_title = params[:page]
                 @page = @wiki.find_or_new_page(page_title)
                 if @page.new_record?
-                  if User.current.allowed_to?(:edit_wiki_pages, @project)
+                  if User.current.allowed_to?(:edit_wiki_pages, @project) && editable?
                     edit
                     render :action => 'edit'
                   else

app/models/wiki.rb +6 0

                 !user.nil? && user.allowed_to?(:view_wiki_pages, project)
               end
+              # Returns the wiki page that acts as the sidebar content
+              # or nil if no such page exists
+              def sidebar
+                @sidebar ||= find_page('Sidebar', :with_redirect => false)
+              end
               # find the page with the given title
               # if page doesn't exist, return a new page
               def find_or_new_page(title)

app/models/wiki_content.rb +4 0

                 page.project
               end
+              def attachments
+                page.nil? ? [] : page.attachments
+              end
               # Returns the mail adresses of users that should be notified
               def recipients
                 notified = project.notified_users

app/models/wiki_page.rb +9 0

@@ -41,6 +41,15 class WikiPage < ActiveRecord::Base
41	validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false	41	validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
42	validates_associated :content	42	validates_associated :content
43		43
		44	# Wiki pages that are protected by default
		45	DEFAULT_PROTECTED_PAGES = %w(sidebar)
		46
		47	def after_initialize
		48	if new_record? && DEFAULT_PROTECTED_PAGES.include?(title.to_s.downcase)
		49	self.protected = true
		50	end
		51	end
		52
44	def visible?(user=User.current)	53	def visible?(user=User.current)
45	!user.nil? && user.allowed_to?(:view_wiki_pages, project)	54	!user.nil? && user.allowed_to?(:view_wiki_pages, project)
46	end	55	end

app/views/wiki/_sidebar.rhtml +4 0

@@ -1,3 +1,7
		1	<% if @wiki && @wiki.sidebar -%>
		2	<%= textilizable @wiki.sidebar.content, :text %>
		3	<% end -%>
		4
1	<h3><%= l(:label_wiki) %></h3>	5	<h3><%= l(:label_wiki) %></h3>
2		6
3	<%= link_to l(:field_start_page), {:action => 'index', :page => nil} %><br />	7	<%= link_to l(:field_start_page), {:action => 'index', :page => nil} %><br />

test/functional/wiki_controller_test.rb +11 0

@@ -70,6 +70,17 class WikiControllerTest < ActionController::TestCase
70	:alt => 'This is a logo' }	70	:alt => 'This is a logo' }
71	end	71	end
72		72
		73	def test_show_with_sidebar
		74	page = Project.find(1).wiki.pages.new(:title => 'Sidebar')
		75	page.content = WikiContent.new(:text => 'Side bar content for test_show_with_sidebar')
		76	page.save!
		77
		78	get :index, :id => 1, :page => 'Another_page'
		79	assert_response :success
		80	assert_tag :tag => 'div', :attributes => {:id => 'sidebar'},
		81	:content => /Side bar content for test_show_with_sidebar/
		82	end
		83
73	def test_show_unexistent_page_without_edit_right	84	def test_show_unexistent_page_without_edit_right
74	get :index, :id => 1, :page => 'Unexistent page'	85	get :index, :id => 1, :page => 'Unexistent page'
75	assert_response 404	86	assert_response 404

test/unit/wiki_page_test.rb +7 0

                 page.title = "Page"
                 assert page.save
                 page.reload
+                assert !page.protected?
                 @wiki.reload
                 assert @wiki.pages.include?(page)
               end
+              def test_sidebar_should_be_protected_by_default
+                page = @wiki.find_or_new_page('sidebar')
+                assert page.new_record?
+                assert page.protected?
+              end
               def test_find_or_new_page
                 page = @wiki.find_or_new_page("CookBook documentation")
                 assert_kind_of WikiPage, page

test/unit/wiki_test.rb +19 0

@@ -43,4 +43,23 class WikiTest < ActiveSupport::TestCase
43	assert_equal 'Page_title_with_CAPITALES', Wiki.titleize('page title with CAPITALES')	43	assert_equal 'Page_title_with_CAPITALES', Wiki.titleize('page title with CAPITALES')
44	assert_equal 'テスト', Wiki.titleize('テスト')	44	assert_equal 'テスト', Wiki.titleize('テスト')
45	end	45	end
		46
		47	context "#sidebar" do
		48	setup do
		49	@wiki = Wiki.find(1)
		50	end
		51
		52	should "return nil if undefined" do
		53	assert_nil @wiki.sidebar
		54	end
		55
		56	should "return a WikiPage if defined" do
		57	page = @wiki.pages.new(:title => 'Sidebar')
		58	page.content = WikiContent.new(:text => 'Side bar content for test_show_with_sidebar')
		59	page.save!
		60
		61	assert_kind_of WikiPage, @wiki.sidebar
		62	assert_equal 'Sidebar', @wiki.sidebar.title
		63	end
		64	end
46	end	65	end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages