Blank comment field for agenda/minutes.

pull/6827/head
Felix Schäfer 14 years ago
parent fe50d19cba
commit 5e8a2b5458
  1. 6
      app/models/meeting_content.rb
  2. 3
      app/models/meeting_minutes.rb
  3. 2
      features/meeting_close.feature

@ -21,6 +21,12 @@ class MeetingContent < ActiveRecord::Base
(content_to && content_from) ? WikiDiff.new(content_to, content_from) : nil (content_to && content_from) ? WikiDiff.new(content_to, content_from) : nil
end end
protected
def after_initialize
self.comment = nil
end
class Version class Version
unloadable unloadable

@ -3,8 +3,11 @@ class MeetingMinutes < MeetingContent
meeting.agenda.present? && meeting.agenda.locked? meeting.agenda.present? && meeting.agenda.locked?
end end
protected
def after_initialize def after_initialize
# set defaults # set defaults
self.text ||= meeting.agenda.text if meeting.present? && meeting.agenda.present? self.text ||= meeting.agenda.text if meeting.present? && meeting.agenda.present?
super
end end
end end

@ -43,6 +43,8 @@ Feature: Close and open meeting agendas
Given the role "user" may have the following rights: Given the role "user" may have the following rights:
| view_meetings | | view_meetings |
| close_meeting_agendas | | close_meeting_agendas |
And the meeting "Bobs Meeting" has 1 agenda with:
| text | "blubber" |
When I login as "alice" When I login as "alice"
And I go to the Meetings page for the project called "dingens" And I go to the Meetings page for the project called "dingens"
And I click on "Bobs Meeting" And I click on "Bobs Meeting"

Loading…
Cancel
Save