From: Jean-Philippe Lang Date: Sat, 7 Jun 2008 15:08:59 +0000 (+0000) Subject: Removes constraint on enumerations name (#1384). X-Git-Tag: 0.8.0-RC1~478 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d446469f5d2d7c50911465c681ab7a469a2f9b24;p=redmine.git Removes constraint on enumerations name (#1384). git-svn-id: http://redmine.rubyforge.org/svn/trunk@1503 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index 400681a43..e86768724 100644 --- a/app/models/enumeration.rb +++ b/app/models/enumeration.rb @@ -23,7 +23,6 @@ class Enumeration < ActiveRecord::Base validates_presence_of :opt, :name validates_uniqueness_of :name, :scope => [:opt] validates_length_of :name, :maximum => 30 - validates_format_of :name, :with => /^[\w\s\'\-]*$/i OPTIONS = { "IPRI" => :enumeration_issue_priorities, diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml index 9de9bf37c..1967e5cf9 100644 --- a/app/views/enumerations/list.rhtml +++ b/app/views/enumerations/list.rhtml @@ -8,7 +8,7 @@ <% enumerations.each do |enumeration| %> - + <%= '' * level %> - + <%= '' * (criterias.length - level - 1) -%> <% total = 0 -%> <% @periods.each do |period| -%>
<%= link_to enumeration.name, :action => 'edit', :id => enumeration %><%= link_to h(enumeration), :action => 'edit', :id => enumeration %> <%= image_tag('true.png') if enumeration.is_default? %> <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => enumeration, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %> diff --git a/app/views/timelog/_report_criteria.rhtml b/app/views/timelog/_report_criteria.rhtml index 94f3d20f9..c9a1cfb45 100644 --- a/app/views/timelog/_report_criteria.rhtml +++ b/app/views/timelog/_report_criteria.rhtml @@ -3,7 +3,7 @@ <% next if hours_for_value.empty? -%>
<%= format_criteria_value(criterias[level], value) %><%= h(format_criteria_value(criterias[level], value)) %>