deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Deconflicting a name of an input for two forms on the same page

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-02-10 21:41:31 +00:00
parent 4e6d2cbdf6
commit 8ab380d6dd
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/wiki_controller.rb
View file

@ -89,7 +89,7 @@ class WikiController < ApplicationController
end end
def remove_orphaned_pages def remove_orphaned_pages
if wiki.authenticate(@params['system_password']) if wiki.authenticate(@params['system_password_orphaned'])
wiki.remove_orphaned_pages(@web_name) wiki.remove_orphaned_pages(@web_name)
flash[:info] = 'Orphaned pages removed' flash[:info] = 'Orphaned pages removed'
redirect_to :action => 'list' redirect_to :action => 'list'

2
app/views/admin/edit_web.rhtml
View file

@ -118,7 +118,7 @@
<p align="right"> <p align="right">
<small> <small>
Clean up by entering system password Clean up by entering system password
<input type="password" id="system_password_orphaned" name="system_password" /> <input type="password" id="system_password_orphaned" name="system_password_orphaned" />
and and
<input type="submit" value="Delete Orphan Pages" /> <input type="submit" value="Delete Orphan Pages" />
</small> </small>

2
test/functional/wiki_controller_test.rb
View file

@ -333,7 +333,7 @@ class WikiControllerTest < Test::Unit::TestCase
"category: trees", "category: trees",
Time.now, Author.new('TreeHugger', '127.0.0.2')) Time.now, Author.new('TreeHugger', '127.0.0.2'))
r = process('remove_orphaned_pages', 'web' => 'wiki1', 'system_password' => 'pswd') r = process('remove_orphaned_pages', 'web' => 'wiki1', 'system_password_orphaned' => 'pswd')
assert_redirected_to :action => 'list' assert_redirected_to :action => 'list'
assert_equal [@home, @oak], @web.select.sort, assert_equal [@home, @oak], @web.select.sort,