kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged r2246 and r2248 from trunk (#2456).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2310 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2009-01-24 13:01:31 +00:00
parent b13ef64794
commit fae04f3ae1
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/issue.rb
View File

@ -45,7 +45,7 @@ class Issue < ActiveRecord::Base
acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]}, acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]},
:author_key => :author_id :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_length_of :subject, :maximum => 255
validates_inclusion_of :done_ratio, :in => 0..100 validates_inclusion_of :done_ratio, :in => 0..100
validates_numericality_of :estimated_hours, :allow_nil => true validates_numericality_of :estimated_hours, :allow_nil => true

2
app/views/issues/_form.rhtml
View File

@ -8,7 +8,7 @@
<div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>> <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_field :subject, :size => 80, :required => true %></p>
<p><%= f.text_area :description, :required => true, <p><%= f.text_area :description,
:cols => 60, :cols => 60,
:rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min), :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
:accesskey => accesskey(:edit), :accesskey => accesskey(:edit),

2
app/views/issues/show.rhtml
View File

@ -59,7 +59,7 @@ end %>
<hr /> <hr />
<div class="contextual"> <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> </div>
<p><strong><%=l(:field_description)%></strong></p> <p><strong><%=l(:field_description)%></strong></p>

10
test/functional/issues_controller_test.rb
View File

@ -378,16 +378,16 @@ class IssuesControllerTest < Test::Unit::TestCase
@request.session[:user_id] = 2 @request.session[:user_id] = 2
post :new, :project_id => 1, post :new, :project_id => 1,
:issue => {:tracker_id => 1, :issue => {:tracker_id => 1,
:subject => 'This is the test_new issue', # empty subject
# empty description :subject => '',
:description => '', :description => 'This is a description',
:priority_id => 6, :priority_id => 6,
:custom_field_values => {'1' => 'Oracle', '2' => 'Value for field 2'}} :custom_field_values => {'1' => 'Oracle', '2' => 'Value for field 2'}}
assert_response :success assert_response :success
assert_template 'new' assert_template 'new'
assert_tag :input, :attributes => { :name => 'issue[subject]', assert_tag :textarea, :attributes => { :name => 'issue[description]' },
:value => 'This is the test_new issue' } :content => 'This is a description'
assert_tag :select, :attributes => { :name => 'issue[priority_id]' }, assert_tag :select, :attributes => { :name => 'issue[priority_id]' },
:child => { :tag => 'option', :attributes => { :selected => 'selected', :child => { :tag => 'option', :attributes => { :selected => 'selected',
:value => '6' }, :value => '6' },

6
test/unit/issue_test.rb
View File

@ -33,6 +33,12 @@ class IssueTest < Test::Unit::TestCase
assert_equal 1.5, issue.estimated_hours assert_equal 1.5, issue.estimated_hours
end 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 def test_create_with_required_custom_field
field = IssueCustomField.find_by_name('Database') field = IssueCustomField.find_by_name('Database')
field.update_attribute(:is_required, true) field.update_attribute(:is_required, true)