summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2017-07-08 13:54:26 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2017-07-08 13:54:26 +0000
commit74111bd9d3a0d848d6db2c7fa3acb8348153298b (patch)
tree173c89df2340bf1c1f94777919ac56b55c2d0943
parent5de545fd795a1e80a4e677ae2e4dc7175d38d81f (diff)
downloadredmine-74111bd9d3a0d848d6db2c7fa3acb8348153298b.tar.gz
redmine-74111bd9d3a0d848d6db2c7fa3acb8348153298b.zip
Kepp the arguments clean (#26043).
git-svn-id: http://svn.redmine.org/redmine/trunk@16775 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/wiki_controller.rb2
-rw-r--r--app/views/wiki/_new_modal.html.erb2
-rw-r--r--app/views/wiki/show.html.erb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 8064cd64f..25e59adb0 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -70,7 +70,7 @@ class WikiController < ApplicationController
@page.title = '' unless editable?
@page.validate
if @page.errors[:title].blank?
- path = project_wiki_page_path(:project_id => @project, :id => @page.title, :parent => params[:parent])
+ path = project_wiki_page_path(@project, @page.title, :parent => params[:parent])
respond_to do |format|
format.html { redirect_to path }
format.js { render :js => "window.location = #{path.to_json}" }
diff --git a/app/views/wiki/_new_modal.html.erb b/app/views/wiki/_new_modal.html.erb
index 472bbd63f..8c9d13a75 100644
--- a/app/views/wiki/_new_modal.html.erb
+++ b/app/views/wiki/_new_modal.html.erb
@@ -1,7 +1,7 @@
<h3 class="title"><%=l(:label_wiki_page_new)%></h3>
<%= labelled_form_for :page, @page,
- :url => new_project_wiki_page_path(:project_id => @project, :parent => params[:parent]),
+ :url => new_project_wiki_page_path(@project, :parent => params[:parent]),
:method => 'post',
:remote => true do |f| %>
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index a77421afa..c7d186176 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -1,6 +1,6 @@
<div class="contextual">
<% if User.current.allowed_to?(:edit_wiki_pages, @project) %>
-<%= link_to l(:label_wiki_page_new), new_project_wiki_page_path(:project_id => @project, :parent => @page.title), :remote => true, :class => 'icon icon-add' %>
+<%= link_to l(:label_wiki_page_new), new_project_wiki_page_path(@project, :parent => @page.title), :remote => true, :class => 'icon icon-add' %>
<% end %>
<% if @editable %>
<% if @content.current_version? %>