jro_apps/redmine Commit - r1689:60d066f943c6

0

db/migrate/095_add_wiki_pages_parent_id.rb created 644 +9 0

@@ -0,0 +1,9
	1	class AddWikiPagesParentId < ActiveRecord::Migration
	2	def self.up
	3	add_column :wiki_pages, :parent_id, :integer, :default => nil
	4	end
	5
	6	def self.down
	7	remove_column :wiki_pages, :parent_id
	8	end
	9	end

0

app/controllers/wiki_controller.rb +1 0

                                                   :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id",
                                                   :order => 'title'
                   @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
+                  @pages_by_parent_id = @pages.group_by(&:parent_id)
                 # export wiki to a single html file
                 when 'export'
                   @pages = @wiki.pages.find :all, :order => 'title'

0

app/helpers/application_helper.rb +2 -1

               end
               def breadcrumb(*args)
-                content_tag('p', args.join(' &#187; ') + ' &#187; ', :class => 'breadcrumb')
+                elements = args.flatten
+                elements.any? ? content_tag('p', args.join(' &#187; ') + ' &#187; ', :class => 'breadcrumb') : nil
               end
               def html_title(*args)

0

app/helpers/wiki_helper.rb +16 0

@@ -17,6 +17,22
17		17
18	module WikiHelper	18	module WikiHelper
19		19
		20	def render_page_hierarchy(pages, node=nil)
		21	content = ''
		22	if pages[node]
		23	content << "<ul class=\"pages-hierarchy\">\n"
		24	pages[node].each do \|page\|
		25	content << "<li>"
		26	content << link_to(h(page.pretty_title), {:action => 'index', :page => page.title},
		27	:title => l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)))
		28	content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id]
		29	content << "</li>\n"
		30	end
		31	content << "</ul>\n"
		32	end
		33	content
		34	end
		35
20	def html_diff(wdiff)	36	def html_diff(wdiff)
21	words = wdiff.words.collect{\|word\| h(word)}	37	words = wdiff.words.collect{\|word\| h(word)}
22	words_add = 0	38	words_add = 0

0

app/models/wiki_page.rb +19 0

@@ -22,6 +22,7 class WikiPage < ActiveRecord::Base
22	belongs_to :wiki	22	belongs_to :wiki
23	has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy	23	has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
24	has_many :attachments, :as => :container, :dependent => :destroy	24	has_many :attachments, :as => :container, :dependent => :destroy
		25	acts_as_tree :order => 'title'
25		26
26	acts_as_event :title => Proc.new {\|o\| "#{l(:label_wiki)}: #{o.title}"},	27	acts_as_event :title => Proc.new {\|o\| "#{l(:label_wiki)}: #{o.title}"},
27	:description => :text,	28	:description => :text,
@@ -110,6 +111,24 class WikiPage < ActiveRecord::Base
110	def editable_by?(usr)	111	def editable_by?(usr)
111	!protected? \|\| usr.allowed_to?(:protect_wiki_pages, wiki.project)	112	!protected? \|\| usr.allowed_to?(:protect_wiki_pages, wiki.project)
112	end	113	end
		114
		115	def parent_title
		116	@parent_title \|\| (self.parent && self.parent.pretty_title)
		117	end
		118
		119	def parent_title=(t)
		120	@parent_title = t
		121	parent_page = t.blank? ? nil : self.wiki.find_page(t)
		122	self.parent = parent_page
		123	end
		124
		125	protected
		126
		127	def validate
		128	errors.add(:parent_title, :activerecord_error_invalid) if !@parent_title.blank? && parent.nil?
		129	errors.add(:parent_title, :activerecord_error_circular_dependency) if parent && (parent == self \|\| parent.ancestors.include?(self))
		130	errors.add(:parent_title, :activerecord_error_not_same_project) if parent && (parent.wiki_id != wiki_id)
		131	end
113	end	132	end
114		133
115	class WikiDiff	134	class WikiDiff

0

app/views/wiki/rename.rhtml +2 -1

             <% labelled_tabular_form_for :wiki_page, @page, :url => { :action => 'rename' } do |f| %>
             <div class="box">
-            <p><%= f.text_field :title, :required => true, :size => 255  %></p>
+            <p><%= f.text_field :title, :required => true, :size => 100  %></p>
             <p><%= f.check_box :redirect_existing_links %></p>
+            <p><%= f.text_field :parent_title, :size => 100  %></p>
             </div>
             <%= submit_tag l(:button_rename) %>
             <% end %>

0

app/views/wiki/show.rhtml +2 0

             <%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
             </div>
+            <%= breadcrumb(@page.ancestors.reverse.collect {|parent| link_to h(parent.pretty_title), {:page => parent.title}}) %>
             <% if @content.version != @page.content.version %>
                 <p>
                 <%= link_to(('&#171; ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>

0

app/views/wiki/special_page_index.rhtml +1 -5

             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
-            <ul><% @pages.each do |page| %>
+            <%= render_page_hierarchy(@pages_by_parent_id) %>
-                <li><%= link_to page.pretty_title, {:action => 'index', :page => page.title},
-                                                   :title => l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) %>
-                </li>
-            <% end %></ul>
             <% content_for :sidebar do %>
               <%= render :partial => 'sidebar' %>

0

lang/bg.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/cs.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/da.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/de.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/en.yml +1 0

             field_searchable: Searchable
             field_default_value: Default value
             field_comments_sorting: Display comments
+            field_parent_title: Parent page
             setting_app_title: Application title
             setting_app_subtitle: Application subtitle

0

lang/es.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/fi.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/fr.yml +1 0

             field_searchable: Utilisé pour les recherches
             field_default_value: Valeur par défaut
             field_comments_sorting: Afficher les commentaires
+            field_parent_title: Page parent
             setting_app_title: Titre de l'application
             setting_app_subtitle: Sous-titre de l'application

0

lang/he.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/hu.yml +1 0

             setting_mail_handler_api_enabled: Web Service engedélyezése a beérkezett levelekhez
             setting_mail_handler_api_key: API kulcs
             text_email_delivery_not_configured: "Az E-mail küldés nincs konfigurálva, és az értesítések ki vannak kapcsolva.\nÁllítsd be az SMTP szervert a config/email.yml fájlban és indítsd újra az alkalmazást, hogy érvénybe lépjen."
+            field_parent_title: Parent page

0

lang/it.yml +1 0

             setting_mail_handler_api_enabled: Abilita WS per le e-mail in arrivo
             setting_mail_handler_api_key: chiave API
             text_email_delivery_not_configured: "La consegna via e-mail non è configurata e le notifiche sono disabilitate.\nConfigura il tuo server SMTP in config/email.yml e riavvia l'applicazione per abilitarle."
+            field_parent_title: Parent page

0

lang/ja.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/ko.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/lt.yml +1 0

             setting_mail_handler_api_key: API raktas
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/nl.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/no.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/pl.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/pt-br.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/pt.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/ro.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/ru.yml +1 0

             setting_mail_handler_api_enabled: Включить веб-сервис для входящих сообщений
             setting_mail_handler_api_key: API ключ
             text_email_delivery_not_configured: "Параметры работы с почтовым сервером не настроены и функция уведомления по email не активна.\nНастроить параметры для вашего SMTP сервера вы можете в файле config/email.yml. Для применения изменений перезапустите приложение."
+            field_parent_title: Parent page

0

lang/sr.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/sv.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/th.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/uk.yml +1 0

             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

lang/zh-tw.yml +1 0

             enumeration_issue_priorities: 項目優先權
             enumeration_doc_categories: 文件分類
             enumeration_activities: 活動 (時間追蹤)
+            field_parent_title: Parent page

0

lang/zh.yml +1 0

             enumeration_doc_categories: 文档类别
             enumeration_activities: 活动（时间跟踪）
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+            field_parent_title: Parent page

0

test/fixtures/wiki_pages.yml +4 0

               id: 1
               wiki_id: 1
               protected: true
+              parent_id:
             wiki_pages_002:
               created_on: 2007-03-08 00:18:07 +01:00
               title: Another_page
               id: 2
               wiki_id: 1
               protected: false
+              parent_id:
             wiki_pages_003:
               created_on: 2007-03-08 00:18:07 +01:00
               title: Start_page
               id: 3
               wiki_id: 2
               protected: false
+              parent_id:
             wiki_pages_004:
               created_on: 2007-03-08 00:18:07 +01:00
               title: Page_with_an_inline_image
               id: 4
               wiki_id: 1
               protected: false
+              parent_id: 1
   No newline at end of file

0

test/functional/wiki_controller_test.rb +10 -2

@@ -163,8 +163,16 class WikiControllerTest < Test::Unit::TestCase
163	pages = assigns(:pages)	163	pages = assigns(:pages)
164	assert_not_nil pages	164	assert_not_nil pages
165	assert_equal Project.find(1).wiki.pages.size, pages.size	165	assert_equal Project.find(1).wiki.pages.size, pages.size
166	assert_tag :tag => 'a', :attributes => { :href => '/wiki/ecookbook/CookBook_documentation' },	166
167	:content => /CookBook documentation/	167	assert_tag :ul, :attributes => { :class => 'pages-hierarchy' },
		168	:child => { :tag => 'li', :child => { :tag => 'a', :attributes => { :href => '/wiki/ecookbook/CookBook_documentation' },
		169	:content => 'CookBook documentation' },
		170	:child => { :tag => 'ul',
		171	:child => { :tag => 'li',
		172	:child => { :tag => 'a', :attributes => { :href => '/wiki/ecookbook/Page_with_an_inline_image' },
		173	:content => 'Page with an inline image' } } } },
		174	:child => { :tag => 'li', :child => { :tag => 'a', :attributes => { :href => '/wiki/ecookbook/Another_page' },
		175	:content => 'Another page' } }
168	end	176	end
169		177
170	def test_not_found	178	def test_not_found

0

test/unit/wiki_page_test.rb +44 0

@@ -48,6 +48,50 class WikiPageTest < Test::Unit::TestCase
48	assert page.new_record?	48	assert page.new_record?
49	end	49	end
50		50
		51	def test_parent_title
		52	page = WikiPage.find_by_title('Another_page')
		53	assert_nil page.parent_title
		54
		55	page = WikiPage.find_by_title('Page_with_an_inline_image')
		56	assert_equal 'CookBook documentation', page.parent_title
		57	end
		58
		59	def test_assign_parent
		60	page = WikiPage.find_by_title('Another_page')
		61	page.parent_title = 'CookBook documentation'
		62	assert page.save
		63	page.reload
		64	assert_equal WikiPage.find_by_title('CookBook_documentation'), page.parent
		65	end
		66
		67	def test_unassign_parent
		68	page = WikiPage.find_by_title('Page_with_an_inline_image')
		69	page.parent_title = ''
		70	assert page.save
		71	page.reload
		72	assert_nil page.parent
		73	end
		74
		75	def test_parent_validation
		76	page = WikiPage.find_by_title('CookBook_documentation')
		77
		78	# A page that doesn't exist
		79	page.parent_title = 'Unknown title'
		80	assert !page.save
		81	assert_equal :activerecord_error_invalid, page.errors.on(:parent_title)
		82	# A child page
		83	page.parent_title = 'Page_with_an_inline_image'
		84	assert !page.save
		85	assert_equal :activerecord_error_circular_dependency, page.errors.on(:parent_title)
		86	# The page itself
		87	page.parent_title = 'CookBook_documentation'
		88	assert !page.save
		89	assert_equal :activerecord_error_circular_dependency, page.errors.on(:parent_title)
		90
		91	page.parent_title = 'Another_page'
		92	assert page.save
		93	end
		94
51	def test_destroy	95	def test_destroy
52	page = WikiPage.find(1)	96	page = WikiPage.find(1)
53	page.destroy	97	page.destroy

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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