jro_apps/redmine Commit - r14352:a371c8d850a2

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

Jean-Philippe Lang -

r14352:a371c8d850a2

parent child

Context file:

r14352:a371c8d850a2

Collapse all files

test/unit/helpers/wiki_helper_test.rb created 644 +45 0

@@ -0,0 +1,45
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2015 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../../../test_helper', __FILE__)
	19
	20	class WikiHelperTest < ActionView::TestCase
	21	include WikiHelper
	22	include Rails.application.routes.url_helpers
	23
	24	fixtures :projects, :users,
	25	:roles, :member_roles, :members,
	26	:enabled_modules, :wikis, :wiki_pages
	27
	28	def test_wiki_page_edit_cancel_path_for_new_page_without_parent_should_be_wiki_index
	29	wiki = Wiki.find(1)
	30	page = WikiPage.new(:wiki => wiki)
	31	assert_equal '/projects/ecookbook/wiki/index', wiki_page_edit_cancel_path(page)
	32	end
	33
	34	def test_wiki_page_edit_cancel_path_for_new_page_with_parent_should_be_parent
	35	wiki = Wiki.find(1)
	36	page = WikiPage.new(:wiki => wiki, :parent => wiki.find_page('Another_page'))
	37	assert_equal '/projects/ecookbook/wiki/Another_page', wiki_page_edit_cancel_path(page)
	38	end
	39
	40	def test_wiki_page_edit_cancel_path_for_existing_page_should_be_the_page
	41	wiki = Wiki.find(1)
	42	page = wiki.find_page('Child_1')
	43	assert_equal '/projects/ecookbook/wiki/Child_1', wiki_page_edit_cancel_path(page)
	44	end
	45	end

app/helpers/wiki_helper.rb +13 0

             # encoding: utf-8
             #
             # 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.
             module WikiHelper
               include Redmine::Export::PDF::WikiPdfHelper
               def wiki_page_options_for_select(pages, selected = nil, parent = nil, level = 0)
                 pages = pages.group_by(&:parent) unless pages.is_a?(Hash)
                 s = ''.html_safe
                 if pages.has_key?(parent)
                   pages[parent].each do |page|
                     attrs = "value='#{page.id}'"
                     attrs << " selected='selected'" if selected == page
                     indent = (level > 0) ? ('&nbsp;' * level * 2 + '&#187; ') : ''
                     s << content_tag('option', (indent + h(page.pretty_title)).html_safe, :value => page.id.to_s, :selected => selected == page) +
                            wiki_page_options_for_select(pages, selected, page, level + 1)
                   end
                 end
                 s
               end
               def wiki_page_wiki_options_for_select(page)
                 projects = Project.allowed_to(:rename_wiki_pages).joins(:wiki).preload(:wiki).to_a
                 projects << page.project unless projects.include?(page.project)
                 project_tree_options_for_select(projects, :selected => page.project) do |project|
                   wiki_id = project.wiki.try(:id)
                   {:value => wiki_id, :selected => wiki_id == page.wiki_id}
                 end
               end
               def wiki_page_breadcrumb(page)
                 breadcrumb(page.ancestors.reverse.collect {|parent|
                   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

app/views/wiki/edit.html.erb +5 -2

             <%= wiki_page_breadcrumb(@page) %>
             <h2><%= @page.pretty_title %></h2>
             <%= form_for @content, :as => :content,
                         :url => {:action => 'update', :id => @page.title},
                         :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
             <%= f.hidden_field :version %>
             <% if @section %>
             <%= hidden_field_tag 'section', @section %>
             <%= hidden_field_tag 'section_hash', @section_hash %>
             <% end %>
             <%= error_messages_for 'content' %>
             <div class="box tabular">
             <%= text_area_tag 'content[text]', @text, :cols => 100, :rows => 25,
                               :class => 'wiki-edit', :accesskey => accesskey(:edit) %>
             <% 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,
                                 content_tag('option', '', :value => '') +
                                    wiki_page_options_for_select(
                                      @wiki.pages.includes(:parent).to_a -
                                      @page.self_and_descendants, @page.parent) %>
                 </p>
               <% end %>
             <% end %>
             <p><label><%= l(:field_comments) %></label><%= f.text_field :comments, :size => 120, :maxlength => 1024 %></p>
             <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
             </div>
-            <p><%= submit_tag l(:button_save) %>
+            <p>
-               <%= preview_link({:controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title }, 'wiki_form') %></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 %>
             <div id="preview" class="wiki"></div>
             <% content_for :header_tags do %>
               <%= robot_exclusion_tag %>
             <% end %>
             <% html_title @page.pretty_title %>

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