openproject-meeting 3.0.2 → 3.0.3

data/app/models/meeting_content.rb

@@ -1,12 +1,20 @@
 #-- copyright
 # OpenProject is a project management system.
-#
-# Copyright (C) 2011-2013 the OpenProject Team
+# Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
 #
-# See doc/COPYRIGHT.rdoc for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.md for more details.
 #++
 
 class MeetingContent < ActiveRecord::Base
@@ -22,10 +30,21 @@ class MeetingContent < ActiveRecord::Base
 
   before_save :comment_to_journal_notes
 
+  acts_as_journalized :activity_type => 'meetings',
+    :activity_permission => :view_meetings,
+    :activity_find_options => {:include => {:meeting => :project}},
+    :event_type => Proc.new {|o| "#{o.journal.journable.class.to_s.underscore.dasherize}"},
+    :event_title => Proc.new {|o| "#{o.journal.journable.class.model_name.human}: #{o.journal.journable.meeting.title}"},
+    :event_url => Proc.new {|o| {:controller => '/meetings', :action => 'show', :id => o.journal.journable.meeting}}
+
   User.before_destroy do |user|
     MeetingContent.update_all ['author_id = ?', DeletedUser.first], ['author_id = ?', user.id]
   end
 
+  def activity_type
+    'meetings'
+  end
+
   def editable?
     true
   end
@@ -41,6 +60,13 @@ class MeetingContent < ActiveRecord::Base
     (content_to && content_from) ? WikiPage::WikiDiff.new(content_to, content_from) : nil
   end
 
+  def at_version(version)
+    journals
+    .joins("JOIN meeting_contents ON meeting_contents.id = journals.journable_id AND meeting_contents.type='#{self.class.to_s}'")
+    .where(:version => version)
+    .first.data
+  end
+
   # Compatibility for mailer.rb
   def updated_on
     updated_at
@@ -62,6 +88,6 @@ class MeetingContent < ActiveRecord::Base
   private
 
   def comment_to_journal_notes
-    init_journal(author, comment) unless changes.empty?
+    add_journal(author, comment) unless changes.empty?
   end
 end

data/app/models/meeting_minutes.rb

@@ -1,81 +1,25 @@
 #-- copyright
 # OpenProject is a project management system.
-#
-# Copyright (C) 2011-2013 the OpenProject Team
+# Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
 #
-# See doc/COPYRIGHT.rdoc for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.md for more details.
 #++
 
 class MeetingMinutes < MeetingContent
 
-  acts_as_journalized :activity_type => 'meetings',
-    :activity_permission => :view_meetings,
-    :activity_find_options => {:include => {:meeting => :project}},
-    :event_title => Proc.new {|o| "#{l :label_meeting_minutes}: #{o.meeting.title}"},
-    :event_url => Proc.new {|o| {:controller => '/meetings', :action => 'show', :id => o.meeting}}
-
-  def activity_type
-    'meetings'
-  end
-
   def editable?
     meeting.agenda.present? && meeting.agenda.locked?
   end
-
-  protected
-
-  MeetingMinutesJournal.class_eval do
-    unloadable
-
-    attr_protected :data
-    after_save :compress_version_text
-
-    # Wiki Content might be large and the data should possibly be compressed
-    def compress_version_text
-      self.text = changed_data["text"].last if changed_data["text"]
-      self.text ||= self.journaled.text if self.journaled.text
-    end
-
-    def text=(plain)
-      case Setting.wiki_compression
-      when "gzip"
-        begin
-          text_hash :text => Zlib::Deflate.deflate(plain, Zlib::BEST_COMPRESSION), :compression => Setting.wiki_compression
-        rescue
-          text_hash :text => plain, :compression => ''
-        end
-      else
-        text_hash :text => plain, :compression => ''
-      end
-      plain
-    end
-
-    def text_hash(hash)
-      changed_data.delete("text")
-      changed_data["data"] = hash[:text]
-      changed_data["compression"] = hash[:compression]
-      update_attribute(:changed_data, changed_data)
-    end
-
-    def text
-      @text ||= case changed_data[:compression]
-      when 'gzip'
-         Zlib::Inflate.inflate(data)
-      else
-        # uncompressed data
-        changed_data["data"]
-      end
-    end
-
-    def meeting
-      journaled.meeting
-    end
-
-    def editable?
-      false
-    end
-  end
 end

data/app/models/meeting_participant.rb

@@ -1,12 +1,20 @@
 #-- copyright
 # OpenProject is a project management system.
-#
-# Copyright (C) 2011-2013 the OpenProject Team
+# Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License version 3.
 #
-# See doc/COPYRIGHT.rdoc for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.md for more details.
 #++
 
 class MeetingParticipant < ActiveRecord::Base

data/app/views/hooks/meetings/_activity_index_head.html.erb

@@ -0,0 +1,21 @@
+<%#-- copyright
+OpenProject is a project management system.
+Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See doc/COPYRIGHT.md for more details.
+
+++#%>
+
+<%= stylesheet_link_tag 'meeting/meeting.css' %>

data/app/views/meeting_contents/_form.html.erb

@@ -1,12 +1,20 @@
 <%#-- copyright
 OpenProject is a project management system.
-
-Copyright (C) 2011-2013 the OpenProject Team
+Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License version 3.
 
-See doc/COPYRIGHT.rdoc for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See doc/COPYRIGHT.md for more details.
 
 ++#%>
 

data/app/views/meeting_contents/_show.html.erb

@@ -1,12 +1,20 @@
 <%#-- copyright
 OpenProject is a project management system.
-
-Copyright (C) 2011-2013 the OpenProject Team
+Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License version 3.
 
-See doc/COPYRIGHT.rdoc for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See doc/COPYRIGHT.md for more details.
 
 ++#%>
 

data/app/views/meeting_contents/diff.html.erb

@@ -1,12 +1,20 @@
 <%#-- copyright
 OpenProject is a project management system.
-
-Copyright (C) 2011-2013 the OpenProject Team
+Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License version 3.
 
-See doc/COPYRIGHT.rdoc for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See doc/COPYRIGHT.md for more details.
 
 ++#%>
 
@@ -15,13 +23,12 @@ See doc/COPYRIGHT.rdoc for more details.
 </div>
 
 <h2><%= l(:"label_#{@content_type}") %>: <%= link_to @meeting, @meeting %></h2>
-
 <p>
 <%= l(:label_version) %> <%= link_to @diff.content_from.version, send(:"#{@content_type}_version_path", @meeting, @diff.content_from.version) %>
-<em>(<%= link_to_user(@diff.content_from.author) %>, <%= format_time(@diff.content_from.updated_at) %>)</em>
+<em>(<%= link_to_user(@diff.content_from.user) %>, <%= format_time(@diff.content_from.created_at) %>)</em>
 &#8594;
 <%= l(:label_version) %> <%= link_to @diff.content_to.version, send(:"#{@content_type}_version_path", @meeting, @diff.content_to.version) %>/<%= @content.version %>
-<em>(<%= link_to_user(@diff.content_to.author) %>, <%= format_time(@diff.content_to.updated_at) %>)</em>
+<em>(<%= link_to_user(@diff.content_to.user) %>, <%= format_time(@diff.content_to.created_at) %>)</em>
 </p>
 
 <hr />

data/app/views/meeting_contents/history.html.erb

@@ -1,12 +1,20 @@
 <%#-- copyright
 OpenProject is a project management system.
-
-Copyright (C) 2011-2013 the OpenProject Team
+Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License version 3.
 
-See doc/COPYRIGHT.rdoc for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See doc/COPYRIGHT.md for more details.
 
 ++#%>
 

data/app/views/meeting_contents/show.html.erb

@@ -1,12 +1,20 @@
 <%#-- copyright
 OpenProject is a project management system.
-
-Copyright (C) 2011-2013 the OpenProject Team
+Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License version 3.
 
-See doc/COPYRIGHT.rdoc for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See doc/COPYRIGHT.md for more details.
 
 ++#%>
 

data/app/views/meeting_mailer/content_for_review.html.erb

@@ -1,12 +1,20 @@
 <%#-- copyright
 OpenProject is a project management system.
-
-Copyright (C) 2011-2013 the OpenProject Team
+Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License version 3.
 
-See doc/COPYRIGHT.rdoc for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See doc/COPYRIGHT.md for more details.
 
 ++#%>
 

data/app/views/meeting_mailer/content_for_review.text.erb

@@ -1,3 +1,23 @@
+<%#-- copyright
+OpenProject is a project management system.
+Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See doc/COPYRIGHT.md for more details.
+
+++#%>
+
 <%= @meeting.project.name %>: <%= @meeting.title %> (<%= @meeting_url %>)
 <%= @meeting.author %>
 

data/app/views/meetings/_form.html.erb

@@ -1,12 +1,20 @@
 <%#-- copyright
 OpenProject is a project management system.
-
-Copyright (C) 2011-2013 the OpenProject Team
+Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License version 3.
 
-See doc/COPYRIGHT.rdoc for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See doc/COPYRIGHT.md for more details.
 
 ++#%>
 

data/app/views/meetings/edit.html.erb

@@ -1,12 +1,20 @@
 <%#-- copyright
 OpenProject is a project management system.
-
-Copyright (C) 2011-2013 the OpenProject Team
+Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License version 3.
 
-See doc/COPYRIGHT.rdoc for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See doc/COPYRIGHT.md for more details.
 
 ++#%>
 

data/app/views/meetings/index.html.erb

@@ -1,12 +1,20 @@
 <%#-- copyright
 OpenProject is a project management system.
-
-Copyright (C) 2011-2013 the OpenProject Team
+Copyright (C) 2011-2013 the OpenProject Foundation (OPF)
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License version 3.
 
-See doc/COPYRIGHT.rdoc for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See doc/COPYRIGHT.md for more details.
 
 ++#%>