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.parent_id = params[:page][:parent_id]
-                 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)
+                 @page.content = @content
+                 if @page.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 %>
-             <p><label><%= check_box_tag 'page[parent_id]', @page.parent.id, true %> <%= l(:field_parent_title) %></label> <%=h @page.parent.pretty_title %></p>
+             <% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %>
+               <% 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

                  get :show, :project_id => 1, :id => 'Unexistent page'
                  assert_response :success
                  assert_template 'edit'
-                 assert_no_tag 'input', :attributes => {:name => 'page[parent_id]'}
                end
-               def test_show_unexistent_page_with_parent
+               def test_show_unexistent_page_with_parent_should_preselect_parent
                  @request.session[:user_id] = 2
                  get :show, :project_id => 1, :id => 'Unexistent page', :parent => 'Another_page'
                  assert_response :success
                  assert_template 'edit'
-                 assert_tag 'input', :attributes => {:name => 'page[parent_id]', :value => '2'}
+                 assert_tag 'select', :attributes => {:name => 'wiki_page[parent_id]'},
+                   :child => {:tag => 'option', :attributes => {:value => '2', :selected => 'selected'}}
                end
                def test_show_should_not_show_history_without_permission
                  assert_difference 'WikiPage.count' do
                    put :update, :project_id => 1, :id => 'New page',
                      :content => {:text => "h1. New page\n\nThis is a new page", :version => 0},
-                     :page => {:parent_id => 2}
+                     :wiki_page => {:parent_id => 2}
                  end
                  page = Project.find(1).wiki.find_page('New page')
                  assert_equal WikiPage.find(2), page.parent
                  assert_equal "my comments", page.content.comments
                end
+               def test_update_page_with_parent
+                 @request.session[:user_id] = 2
+                 assert_no_difference 'WikiPage.count' do
+                   assert_no_difference 'WikiContent.count' do
+                     assert_difference 'WikiContent::Version.count' do
+                       put :update, :project_id => 1,
+                         :id => 'Another_page',
+                         :content => {
+                           :comments => "my comments",
+                           :text => "edited",
+                           :version => 1
+                         },
+                         :wiki_page => {:parent_id => '1'}
+                     end
+                   end
+                 end
+                 assert_redirected_to '/projects/ecookbook/wiki/Another_page'
+                 page = Wiki.find(1).pages.find_by_title('Another_page')
+                 assert_equal "edited", page.content.text
+                 assert_equal 2, page.content.version
+                 assert_equal "my comments", page.content.comments
+                 assert_equal WikiPage.find(1), page.parent
+               end
                def test_update_page_with_failure
                  @request.session[:user_id] = 2
                  assert_no_difference 'WikiPage.count' do
                  assert_tag :tag => 'input', :attributes => {:id => 'content_version', :value => '1'}
                end
+               def test_update_page_with_parent_change_only_should_not_create_content_version
+                 @request.session[:user_id] = 2
+                 assert_no_difference 'WikiPage.count' do
+                   assert_no_difference 'WikiContent.count' do
+                     assert_no_difference 'WikiContent::Version.count' do
+                       put :update, :project_id => 1,
+                         :id => 'Another_page',
+                         :content => {
+                           :comments => '',
+                           :text => Wiki.find(1).find_page('Another_page').content.text,
+                           :version => 1
+                         },
+                         :wiki_page => {:parent_id => '1'}
+                     end
+                   end
+                 end
+                 page = Wiki.find(1).pages.find_by_title('Another_page')
+                 assert_equal 1, page.content.version
+                 assert_equal WikiPage.find(1), page.parent
+               end
                def test_update_page_with_attachments_only_should_not_create_content_version
                  @request.session[:user_id] = 2
                  assert_no_difference 'WikiPage.count' do
                      end
                    end
                  end
+                 page = Wiki.find(1).pages.find_by_title('Another_page')
+                 assert_equal 1, page.content.version
                end
                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