diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-01-07 19:47:24 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-01-07 19:47:24 +0000 |
| commit | bc270b31c3663bf621482bf86369b537b728fb1f (patch) | |
| tree | e8a194e28910685a2369b95c2041ea66067a427a | |
| parent | cd83f72da47f0b6e93a69de04f582c18fca20df8 (diff) | |
| download | redmine-bc270b31c3663bf621482bf86369b537b728fb1f.tar.gz redmine-bc270b31c3663bf621482bf86369b537b728fb1f.zip | |
Makes issue description a non-required field (#2456).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2246 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/issue.rb | 2 | ||||
| -rw-r--r-- | app/views/issues/_form.rhtml | 2 | ||||
| -rw-r--r-- | app/views/issues/show.rhtml | 2 | ||||
| -rw-r--r-- | test/unit/issue_test.rb | 6 |
4 files changed, 9 insertions, 3 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index fcac38bde..e3a9e17ee 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -45,7 +45,7 @@ class Issue < ActiveRecord::Base acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]}, :author_key => :author_id - validates_presence_of :subject, :description, :priority, :project, :tracker, :author, :status + validates_presence_of :subject, :priority, :project, :tracker, :author, :status validates_length_of :subject, :maximum => 255 validates_inclusion_of :done_ratio, :in => 0..100 validates_numericality_of :estimated_hours, :allow_nil => true diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml index 7ae990d5f..0ca12554d 100644 --- a/app/views/issues/_form.rhtml +++ b/app/views/issues/_form.rhtml @@ -8,7 +8,7 @@ <div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>> <p><%= f.text_field :subject, :size => 80, :required => true %></p> -<p><%= f.text_area :description, :required => true, +<p><%= f.text_area :description, :cols => 60, :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min), :accesskey => accesskey(:edit), diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index d5babe331..28d656667 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -59,7 +59,7 @@ end %> <hr /> <div class="contextual"> -<%= link_to_remote_if_authorized l(:button_quote), { :url => {:action => 'reply', :id => @issue} }, :class => 'icon icon-comment' %> +<%= link_to_remote_if_authorized(l(:button_quote), { :url => {:action => 'reply', :id => @issue} }, :class => 'icon icon-comment') unless @issue.description.blank? %> </div> <p><strong><%=l(:field_description)%></strong></p> diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb index 6615cac0c..ed7593a30 100644 --- a/test/unit/issue_test.rb +++ b/test/unit/issue_test.rb @@ -33,6 +33,12 @@ class IssueTest < Test::Unit::TestCase assert_equal 1.5, issue.estimated_hours end + def test_create_minimal + issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'test_create') + assert issue.save + assert issue.description.nil? + end + def test_create_with_required_custom_field field = IssueCustomField.find_by_name('Database') field.update_attribute(:is_required, true) |