comparison app/controllers/wikis_controller.rb @ 931:ec1c49528f36 cannam_integration

Merge from branch "redmine-1.3"
author Chris Cannam
date Wed, 27 Jun 2012 15:04:58 +0100
parents 5f33065ddc4b
children 433d4f72a19b
comparison
equal deleted inserted replaced
930:027cc0f5d4a2 931:ec1c49528f36
20 before_filter :find_project, :authorize 20 before_filter :find_project, :authorize
21 21
22 # Create or update a project's wiki 22 # Create or update a project's wiki
23 def edit 23 def edit
24 @wiki = @project.wiki || Wiki.new(:project => @project) 24 @wiki = @project.wiki || Wiki.new(:project => @project)
25 @wiki.attributes = params[:wiki] 25 @wiki.safe_attributes = params[:wiki]
26 @wiki.save if request.post? 26 @wiki.save if request.post?
27 render(:update) {|page| page.replace_html "tab-content-wiki", :partial => 'projects/settings/wiki'} 27 render(:update) {|page| page.replace_html "tab-content-wiki", :partial => 'projects/settings/wiki'}
28 end 28 end
29 29
30 # Delete a project's wiki 30 # Delete a project's wiki