jro_apps/redmine Commit - r2308:fae04f3ae1f6

Merged r2246 and r2248 from trunk (#2456)....

Jean-Philippe Lang -

r2308:fae04f3ae1f6

parent child

Context file:

r2308:fae04f3ae1f6

app/models/issue.rb +1 -1

               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

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

             <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),

app/views/issues/show.rhtml +1 -1

             <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>

test/functional/issues_controller_test.rb +5 -5

                 @request.session[:user_id] = 2
                 post :new, :project_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,
                                       :custom_field_values => {'1' => 'Oracle', '2' => 'Value for field 2'}}
                 assert_response :success
                 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]' },
                                     :child => { :tag => 'option', :attributes => { :selected => 'selected',
                                                                                    :value => '6' },

test/unit/issue_test.rb +6 0

                 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)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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