meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-10-17 17:01:01 +00:00
Code Issues Releases Wiki Activity

Add cancel button during edition of a wiki page (#4285).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14734 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-10-24 06:51:26 +00:00
parent 68620da79a
commit a371c8d850
3 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/helpers/wiki_helper.rb
View File

@ -51,4 +51,17 @@ module WikiHelper
link_to(h(parent.pretty_title), {:controller => 'wiki', :action => 'show', :id => parent.title, :project_id => parent.project, :version => nil})
})
end
# Returns the path for the Cancel link when editing a wiki page
def wiki_page_edit_cancel_path(page)
if page.new_record?
if parent = page.parent
project_wiki_page_path(parent.project, parent.title)
else
project_wiki_index_path(page.project)
end
else
project_wiki_page_path(page.project, page.title)
end
end
end

7
app/views/wiki/edit.html.erb
View File

@ -33,8 +33,11 @@
<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
</div>
<p><%= submit_tag l(:button_save) %>
<%= preview_link({:controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title }, 'wiki_form') %></p>
<p>
<%= submit_tag l(:button_save) %>
<%= preview_link({:controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title }, 'wiki_form') %>
| <%= link_to l(:button_cancel), wiki_page_edit_cancel_path(@page) %>
</p>
<%= wikitoolbar_for 'content_text' %>
<% end %>

45
test/unit/helpers/wiki_helper_test.rb Normal file
View File

@ -0,0 +1,45 @@
# Redmine - project management software
# Copyright (C) 2006-2015 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
require File.expand_path('../../../test_helper', __FILE__)
class WikiHelperTest < ActionView::TestCase
include WikiHelper
include Rails.application.routes.url_helpers
fixtures :projects, :users,
:roles, :member_roles, :members,
:enabled_modules, :wikis, :wiki_pages
def test_wiki_page_edit_cancel_path_for_new_page_without_parent_should_be_wiki_index
wiki = Wiki.find(1)
page = WikiPage.new(:wiki => wiki)
assert_equal '/projects/ecookbook/wiki/index', wiki_page_edit_cancel_path(page)
end
def test_wiki_page_edit_cancel_path_for_new_page_with_parent_should_be_parent
wiki = Wiki.find(1)
page = WikiPage.new(:wiki => wiki, :parent => wiki.find_page('Another_page'))
assert_equal '/projects/ecookbook/wiki/Another_page', wiki_page_edit_cancel_path(page)
end
def test_wiki_page_edit_cancel_path_for_existing_page_should_be_the_page
wiki = Wiki.find(1)
page = wiki.find_page('Child_1')
assert_equal '/projects/ecookbook/wiki/Child_1', wiki_page_edit_cancel_path(page)
end
end