Defect #10673 » allow-dots-and-commas-in-wiki-page-names.patch
| app/models/wiki.rb | ||
|---|---|---|
|
acts_as_watchable
|
||
|
validates_presence_of :start_page
|
||
|
validates_format_of :start_page, :with => /\A[^,\.\/\?\;\|\:]*\z/
|
||
|
validates_format_of :start_page, :with => /\A[^\/\?\;\|\:]*\z/
|
||
|
validates_length_of :start_page, maximum: 255
|
||
|
before_destroy :delete_redirects
|
||
| ... | ... | |
|
# turn a string into a valid page title
|
||
|
def self.titleize(title)
|
||
|
# replace spaces with _ and remove unwanted caracters
|
||
|
title = title.gsub(/\s+/, '_').delete(',./?;|:') if title
|
||
|
title = title.gsub(/\s+/, '_').delete('/?;|:') if title
|
||
|
# upcase the first letter
|
||
|
title = (title.slice(0..0).upcase + (title.slice(1..-1) || '')) if title
|
||
|
title
|
||
| app/models/wiki_page.rb | ||
|---|---|---|
|
attr_writer :deleted_attachment_ids
|
||
|
validates_presence_of :title
|
||
|
validates_format_of :title, :with => /\A[^,\.\/\?\;\|\s]*\z/
|
||
|
validates_format_of :title, :with => /\A[^\/\?\;\|\s]*\z/
|
||
|
validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
|
||
|
validates_length_of :title, maximum: 255
|
||
|
validates_associated :content
|
||
| app/views/wiki/_new_modal.html.erb | ||
|---|---|---|
|
<div class="box tabular">
|
||
|
<p>
|
||
|
<%= f.text_field :title, :name => 'title', :size => 60, :required => true %>
|
||
|
<em class="info"><%= l(:text_unallowed_characters) %>: , . / ? ; : |</em>
|
||
|
<em class="info"><%= l(:text_unallowed_characters) %>: / ? ; : |</em>
|
||
|
</p>
|
||
|
<p>
|
||
|
<% if params[:parent].present? %>
|
||
| app/views/wiki/new.html.erb | ||
|---|---|---|
|
<div class="box tabular">
|
||
|
<p>
|
||
|
<%= f.text_field :title, :name => 'title', :size => 60, :required => true %>
|
||
|
<em class="info"><%= l(:text_unallowed_characters) %>: , . / ? ; : |</em>
|
||
|
<em class="info"><%= l(:text_unallowed_characters) %>: / ? ; : |</em>
|
||
|
</p>
|
||
|
</div>
|
||
| config/routes.rb | ||
|---|---|---|
|
end
|
||
|
match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
|
||
|
resources :wiki, :except => [:index, :create], :as => 'wiki_page' do
|
||
|
member do
|
||
|
get 'rename'
|
||
|
post 'rename'
|
||
|
get 'history'
|
||
|
get 'diff'
|
||
|
match 'preview', :via => [:post, :put, :patch]
|
||
|
post 'protect'
|
||
|
post 'add_attachment'
|
||
|
end
|
||
|
collection do
|
||
|
get 'export'
|
||
|
get 'date_index'
|
||
|
post 'new'
|
||
|
constraints(id: /[^\/]+/) do
|
||
|
resources :wiki, :except => [:index, :create], :as => 'wiki_page' do
|
||
|
member do
|
||
|
get 'rename'
|
||
|
post 'rename'
|
||
|
get 'history'
|
||
|
get 'diff'
|
||
|
match 'preview', :via => [:post, :put, :patch]
|
||
|
post 'protect'
|
||
|
post 'add_attachment'
|
||
|
end
|
||
|
collection do
|
||
|
get 'export'
|
||
|
get 'date_index'
|
||
|
post 'new'
|
||
|
end
|
||
|
end
|
||
|
end
|
||
|
match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
|
||
|
get 'wiki/:id/:version', :to => 'wiki#show', :constraints => {:version => /\d+/}
|
||
|
delete 'wiki/:id/:version', :to => 'wiki#destroy_version'
|
||
|
get 'wiki/:id/:version/annotate', :to => 'wiki#annotate'
|
||
|
get 'wiki/:id/:version/diff', :to => 'wiki#diff'
|
||
|
match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
|
||
|
get 'wiki/:id/:version', :to => 'wiki#show', :constraints => {:version => /\d+/}
|
||
|
delete 'wiki/:id/:version', :to => 'wiki#destroy_version'
|
||
|
get 'wiki/:id/:version/annotate', :to => 'wiki#annotate'
|
||
|
get 'wiki/:id/:version/diff', :to => 'wiki#diff'
|
||
|
end
|
||
|
end
|
||
|
resources :issues do
|
||
- « Previous
- 1
- 2
- 3
- 4
- Next »