jro_apps/redmine Commit - r460:8d7de50ca8f7

0

app/models/wiki.rb +2 -1

               has_many :pages, :class_name => 'WikiPage', :dependent => :destroy
               validates_presence_of :start_page
+              validates_format_of :start_page, :with => /^[^,\.\/\?\;\|]*$/
               # find the page with the given title
               # if page doesn't exist, return a new page
               # 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[0..0].upcase + title[1..-1] if title
                 title

0

app/models/wiki_page.rb +1 -1

               has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
               validates_presence_of :title
-              validates_format_of :title, :with => /^[^,\s]*$/
+              validates_format_of :title, :with => /^[^,\.\/\?\;\|\s]*$/
               validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
               validates_associated :content

0

app/views/projects/_form.rhtml +1 -1

             <%= hidden_field_tag "wiki_enabled", 0 %>
             <div id="wiki">
             <% fields_for :wiki, @project.wiki, { :builder => TabularFormBuilder, :lang => current_language} do |wiki| %>
-            <p><%= wiki.text_field :start_page, :size => 60, :required => true %></p>
+            <p><%= wiki.text_field :start_page, :size => 60, :required => true %><br /><em><%= l(:text_unallowed_characters) %>: , . / ? ; |</em></p>
             <% # content_tag("div", "", :id => "wiki_start_page_auto_complete", :class => "auto_complete") +
                # auto_complete_field("wiki_start_page", { :url => { :controller => 'wiki', :action => 'auto_complete_for_wiki_page', :id => @project } })
             %>

0

lang/de.yml +1 0

             text_caracters_maximum: %d characters maximum.
             text_length_between: Length between %d and %d characters.
             text_tracker_no_workflow: No workflow defined for this tracker
+            text_unallowed_characters: Unallowed characters
             default_role_manager: Manager
             default_role_developper: Developer

0

lang/en.yml +1 0

             text_caracters_maximum: %d characters maximum.
             text_length_between: Length between %d and %d characters.
             text_tracker_no_workflow: No workflow defined for this tracker
+            text_unallowed_characters: Unallowed characters
             default_role_manager: Manager
             default_role_developper: Developer

0

lang/es.yml +1 0

             text_caracters_maximum: %d characters maximum.
             text_length_between: Length between %d and %d characters.
             text_tracker_no_workflow: No workflow defined for this tracker
+            text_unallowed_characters: Unallowed characters
             default_role_manager: Manager
             default_role_developper: Desarrollador

0

lang/fr.yml +1 0

             text_caracters_maximum: %d caractères maximum.
             text_length_between: Longueur comprise entre %d et %d caractères.
             text_tracker_no_workflow: Aucun worflow n'est défini pour ce tracker
+            text_unallowed_characters: Caractères non autorisés
             default_role_manager: Manager
             default_role_developper: Développeur

0

lang/it.yml +1 0

             text_caracters_maximum: %d characters maximum.
             text_length_between: Length between %d and %d characters.
             text_tracker_no_workflow: No workflow defined for this tracker
+            text_unallowed_characters: Unallowed characters
             default_role_manager: Manager
             default_role_developper: Sviluppatore

0

lang/ja.yml +1 0

             text_caracters_maximum: 最大 %d 文字です。
             text_length_between: 長さは %d から %d 文字までです。
             text_tracker_no_workflow: このトラッカーにワークフローが定義されていません
+            text_unallowed_characters: Unallowed characters
             default_role_manager: 管理者
             default_role_developper: 開発者

0

lang/pt.yml +1 0

             text_caracters_maximum: %d maximo de caracteres
             text_length_between: Tamanho entre %d e %d caracteres.
             text_tracker_no_workflow: Sem workflow definido para este tipo.
+            text_unallowed_characters: Unallowed characters
             default_role_manager: Analista de Negocio ou Gerente de Projeto
             default_role_developper: Desenvolvedor

0

lang/zh.yml +1 0

             text_caracters_maximum: %d characters maximum.
             text_length_between: Length between %d and %d characters.
             text_tracker_no_workflow: No workflow defined for this tracker
+            text_unallowed_characters: Unallowed characters
             default_role_manager: 管理员
             default_role_developper: 开发人员

	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