Changeset 375
- Timestamp:
- 01/04/07 10:43:12 (2 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.2-alpha/app/controllers/report_controller.rb
r339 r375 99 99 @report.cause_work_order_id = @cause_work_order_id if @cause_work_order_id 100 100 101 if @report.valid ? and @report.validate_fields101 if @report.validate_fields and @report.valid? 102 102 @report.editable = params[:report][:editable] if params[:report] and @report_type.editable 103 103 @report.ready = true branches/1.2-alpha/app/helpers/application_helper.rb
r371 r375 17 17 18 18 for error in additional_errors.flatten 19 object.errors.add (*error)19 object.errors.add_to_base(*error) 20 20 end 21 21 branches/1.2-alpha/app/models/report_field_value.rb
r371 r375 13 13 def human_attribute_name(attribute) 14 14 return self.report_field.name 15 end 16 17 # Use this insetead of errors.full_messages 18 def error_messages 19 result = [] 20 self.errors.each { |attribute, message| 21 result.push(message.gsub('%{fn}', self.report_field.name)) 22 } 23 return result 15 24 end 16 25 branches/1.2-alpha/app/views/report/_creation_form.rhtml
r264 r375 6 6 <% @first_year ||= Time.now.year - 15; @years ||= 30; -%> 7 7 8 <% field_error_messages = report.report_field_values.collect { |v| v.error s.full_messages } -%>8 <% field_error_messages = report.report_field_values.collect { |v| v.error_messages } -%> 9 9 <%= additional_error_messages_for('report', field_error_messages) %> 10 10
