jro_apps/redmine Commit - r8667:001b255b081b

Ability to edit a wiki page's parent on the edit page (#6449)....

Jean-Philippe Lang -

r8667:001b255b081b

parent child

Context file:

r8667:001b255b081b

Collapse all files

app/controllers/wiki_controller.rb +6 -7

               def update
                 return render_403 unless editable?
                 @page.content = WikiContent.new(:page => @page) if @page.new_record?
+                @page.safe_attributes = params[:wiki_page]
                 @content = @page.content_for_version(params[:version])
                 @content.text = initial_page_content(@page) if @content.text.blank?
                 if !@page.new_record? && params[:content].present? && @content.text == params[:content][:text]
                   attachments = Attachment.attach_files(@page, params[:attachments])
                   render_attachment_warning_if_needed(@page)
-                  # don't save if text wasn't changed
+                  # don't save content if text wasn't changed
+                  @page.save
                   redirect_to :action => 'show', :project_id => @project, :id => @page.title
                   return
                 end
                 @content.comments = params[:content][:comments]
                 @text = params[:content][:text]
                 if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
                   @content.text = @text
                 end
                 @content.author = User.current
-                if @page.new_record? && params[:page]
+                @page.content = @content
-                  @page.parent_id = params[:page][:parent_id]
+                if @page.save
-                end
-                # if page is new @page.save will also save content, but not if page isn't a new record
-                if (@page.new_record? ? @page.save : @content.save)
                   attachments = Attachment.attach_files(@page, params[:attachments])
                   render_attachment_warning_if_needed(@page)
                   call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})

app/models/wiki_page.rb +5 0

             require 'enumerator'
             class WikiPage < ActiveRecord::Base
+              include Redmine::SafeAttributes
               belongs_to :wiki
               has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
               acts_as_attachable :delete_permission => :delete_wiki_pages_attachments
               # Wiki pages that are protected by default
               DEFAULT_PROTECTED_PAGES = %w(sidebar)
+              safe_attributes 'parent_id',
+                :if => lambda {|page, user| page.new_record? || user.allowed_to?(:rename_wiki_pages, page.project)}
               def initialize(attributes=nil, *args)
                 super
                 if new_record? && DEFAULT_PROTECTED_PAGES.include?(title.to_s.downcase)

app/views/wiki/edit.html.erb +7 -2

             <div class="box tabular">
             <%= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %>
-            <% if @page.new_record? && @page.parent %>
+            <% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %>
-            <p><label><%= check_box_tag 'page[parent_id]', @page.parent.id, true %> <%= l(:field_parent_title) %></label> <%=h @page.parent.pretty_title %></p>
+              <% fields_for @page do |fp| %>
+                <p>
+                	<label><%= l(:field_parent_title) %></label>
+            		  <%= fp.select :parent_id, "<option value=''></option>" + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent) %>
+            		</p>
+              <% end %>
             <% end %>
             <p><label><%= l(:field_comments) %></label><%= f.text_field :comments, :size => 120 %></p>

test/functional/wiki_controller_test.rb +52 -4

@@ -124,15 +124,15 class WikiControllerTest < ActionController::TestCase
124	get :show, :project_id => 1, :id => 'Unexistent page'	124	get :show, :project_id => 1, :id => 'Unexistent page'
125	assert_response :success	125	assert_response :success
126	assert_template 'edit'	126	assert_template 'edit'
127	assert_no_tag 'input', :attributes => {:name => 'page[parent_id]'}
128	end	127	end
129		128
130	def test_show_unexistent_page_with_parent	129	def test_show_unexistent_page_with_parent_should_preselect_parent
131	@request.session[:user_id] = 2	130	@request.session[:user_id] = 2
132	get :show, :project_id => 1, :id => 'Unexistent page', :parent => 'Another_page'	131	get :show, :project_id => 1, :id => 'Unexistent page', :parent => 'Another_page'
133	assert_response :success	132	assert_response :success
134	assert_template 'edit'	133	assert_template 'edit'
135	assert_tag '~~inpu~~t', :attributes => {:name => 'page[parent_id]', ~~:value~~ => ~~'2'~~}	134	assert_tag 'select', :attributes => {:name => 'wiki_page[parent_id]'},
		135	:child => {:tag => 'option', :attributes => {:value => '2', :selected => 'selected'}}
136	end	136	end
137		137
138	def test_show_should_not_show_history_without_permission	138	def test_show_should_not_show_history_without_permission
@@ -183,7 +183,7 class WikiControllerTest < ActionController::TestCase
183	assert_difference 'WikiPage.count' do	183	assert_difference 'WikiPage.count' do
184	put :update, :project_id => 1, :id => 'New page',	184	put :update, :project_id => 1, :id => 'New page',
185	:content => {:text => "h1. New page\n\nThis is a new page", :version => 0},	185	:content => {:text => "h1. New page\n\nThis is a new page", :version => 0},
186	:page => {:parent_id => 2}	186	:wiki_page => {:parent_id => 2}
187	end	187	end
188	page = Project.find(1).wiki.find_page('New page')	188	page = Project.find(1).wiki.find_page('New page')
189	assert_equal WikiPage.find(2), page.parent	189	assert_equal WikiPage.find(2), page.parent
@@ -250,6 +250,31 class WikiControllerTest < ActionController::TestCase
250	assert_equal "my comments", page.content.comments	250	assert_equal "my comments", page.content.comments
251	end	251	end
252		252
		253	def test_update_page_with_parent
		254	@request.session[:user_id] = 2
		255	assert_no_difference 'WikiPage.count' do
		256	assert_no_difference 'WikiContent.count' do
		257	assert_difference 'WikiContent::Version.count' do
		258	put :update, :project_id => 1,
		259	:id => 'Another_page',
		260	:content => {
		261	:comments => "my comments",
		262	:text => "edited",
		263	:version => 1
		264	},
		265	:wiki_page => {:parent_id => '1'}
		266	end
		267	end
		268	end
		269	assert_redirected_to '/projects/ecookbook/wiki/Another_page'
		270
		271	page = Wiki.find(1).pages.find_by_title('Another_page')
		272	assert_equal "edited", page.content.text
		273	assert_equal 2, page.content.version
		274	assert_equal "my comments", page.content.comments
		275	assert_equal WikiPage.find(1), page.parent
		276	end
		277
253	def test_update_page_with_failure	278	def test_update_page_with_failure
254	@request.session[:user_id] = 2	279	@request.session[:user_id] = 2
255	assert_no_difference 'WikiPage.count' do	280	assert_no_difference 'WikiPage.count' do
@@ -273,6 +298,27 class WikiControllerTest < ActionController::TestCase
273	assert_tag :tag => 'input', :attributes => {:id => 'content_version', :value => '1'}	298	assert_tag :tag => 'input', :attributes => {:id => 'content_version', :value => '1'}
274	end	299	end
275		300
		301	def test_update_page_with_parent_change_only_should_not_create_content_version
		302	@request.session[:user_id] = 2
		303	assert_no_difference 'WikiPage.count' do
		304	assert_no_difference 'WikiContent.count' do
		305	assert_no_difference 'WikiContent::Version.count' do
		306	put :update, :project_id => 1,
		307	:id => 'Another_page',
		308	:content => {
		309	:comments => '',
		310	:text => Wiki.find(1).find_page('Another_page').content.text,
		311	:version => 1
		312	},
		313	:wiki_page => {:parent_id => '1'}
		314	end
		315	end
		316	end
		317	page = Wiki.find(1).pages.find_by_title('Another_page')
		318	assert_equal 1, page.content.version
		319	assert_equal WikiPage.find(1), page.parent
		320	end
		321
276	def test_update_page_with_attachments_only_should_not_create_content_version	322	def test_update_page_with_attachments_only_should_not_create_content_version
277	@request.session[:user_id] = 2	323	@request.session[:user_id] = 2
278	assert_no_difference 'WikiPage.count' do	324	assert_no_difference 'WikiPage.count' do
@@ -291,6 +337,8 class WikiControllerTest < ActionController::TestCase
291	end	337	end
292	end	338	end
293	end	339	end
		340	page = Wiki.find(1).pages.find_by_title('Another_page')
		341	assert_equal 1, page.content.version
294	end	342	end
295		343
296	def test_update_stale_page_should_not_raise_an_error	344	def test_update_stale_page_should_not_raise_an_error

General Comments 0

Write
Preview

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

No TODOs yet

	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