openproject-meeting 3.0.2 → 3.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjQxNGYzYWRjNTk1ZmRiZGQ2MWMyOWJmNmVjZTE2NmJjOWFlMzI1MQ==
+    MDg3ZDE3YmFkYzMwMWFkMmY3YzM1NTU4ZTFjZGM5MjVmMWQxYjUxMQ==
   data.tar.gz: !binary |-
-    YjE0ZDhlNmI4YWI1ZGRjNDNmOWJkZjg1Mjg3OGE4MGY5MjkyZjViNA==
-!binary "U0hBNTEy":
+    NTA3NmUxNTI5NzVhOTFhMzY3NzlhMTcwNjg5MTQyNGIzMWUzNjM5NQ==
+SHA512:
   metadata.gz: !binary |-
-    MTUzZmIxOThmY2ZjOWYwZDY1MzZhYTcxMGJiNzQwNmRjZjA1NGJiOGRkZDFm
-    NGIwNTA4Y2UzZDYxNjg4ODAxMGRhZDI1OGZiNGVjYjUzMGE2MDJlZWZiZDk2
-    Nzc0ZDE4OWE1ZmUyM2Q0MjNhNjUyNmEyZGYyOGRkNTExMzA0MmY=
+    MTAyMGEyMGVhNDhjNzFlZmU2Nzc0NjgwNzA2OTQzYzljOWQzNmY0MTgzMTJm
+    MmM2MzU4NjNmMjVjZTI0OTJhNzFjNmY5NmYyMzg1NTk4MDc1Y2NkODg2ODBj
+    NTAwMTQ4ODRiZjZlM2E0MWI1YjMwMGQzMjcwZTQ3NmU2NmE2MGI=
   data.tar.gz: !binary |-
-    Y2I1NzQzOTk4NzgwOTBhNWFlZjVmZjdjZmQ0NjJkYWEwYjcyOTBhODk5OWI1
-    YjJjYmYyNTkyOTY1MjNmYWVhMWExMDZkZWM2YjBlNjZkY2YyNDcxNGMyYzM0
-    YTEzMTRiNTYwZDE1YWM0OGYxMTFkYmUxMmQ3YjZlNWZmZTE2ZGQ=
+    OWU4NTMwZWQwYzQ3YmMxMTdjYTlkNmRjOTQ1MGEzYzU3OTY5ZWYyODkwNWM1
+    ZjJmNzRlMjJiZTAwM2JlMTAyNmFkYmU5NzcxOWQzNWMwZTVmNDE1ODk5ZWQ0
+    ZjY0M2U1MWFlZWZmMjM2YmVmYTEyNTJjMTlmMWY1NTgxOWM1MTU=

data/CHANGELOG.md

@@ -1,5 +1,33 @@
+<!---- 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.
+
+++-->
+
 # Changelog
 
+## 3.0.3
+
+* `#1790` Adapt Meeting Plugin to the acts_as_journalized changes
+
+## 3.0.2
+
+* `#1602` Copyright notice updates and wiring to specific Core versions because of coming update to acts_as_journalized
+
 ## 3.0.1
 
 * `#1673` Fixed missing translation in diff view

data/README.md

@@ -15,7 +15,7 @@ Requirements
 ------------
 
 The Meeting plugin currently requires the [OpenProject Core](https://github.com/opf/openproject/) in
-version 3.0.0pre9 to 3.0.0pre12.
+version greater or equal to 3.0.0pre18.
 
 
 Installation
@@ -76,7 +76,7 @@ Special thanks go to
 License
 -------
 
-(c) 2011 - 2013 - Finn GmbH
+(c) 2011 - 2013 - the OpenProject Foundation (OPF)
 
-This plugin is licensed under the GNU GPL v3. See doc/COPYRIGHT.rdoc and
+This plugin is licensed under the GNU GPL v3. See doc/COPYRIGHT.md and
 doc/GPL.txt for details.

data/app/assets/stylesheets/meeting/meeting.css.erb

@@ -1,13 +1,22 @@
-//-- copyright
-// OpenProject is a project management system.
-//
-// Copyright (C) 2011-2013 the OpenProject Team
-//
-// 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.
-//++
+/*-- 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.
+
+++*/
 
 .meetings div.meeting {padding-bottom: 1em;}
 div.meeting_content {padding-bottom: 2em;}

data/app/controllers/meeting_agendas_controller.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 MeetingAgendasController < MeetingContentsController

data/app/controllers/meeting_contents_controller.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 MeetingContentsController < ApplicationController
@@ -26,10 +34,16 @@ class MeetingContentsController < ApplicationController
   before_filter :authorize
 
   def show
-    # Redirect links to the last version
-    (redirect_to :controller => '/meetings', :action => :show, :id => @meeting, :tab => @content_type.sub(/^meeting_/, '') and return) if params[:id].present? && @content.version == params[:id].to_i
-
-    @content = @content.journals.at params[:id].to_i unless params[:id].blank?
+    if params[:id].present? && @content.version == params[:id].to_i
+      # Redirect links to the last version
+      redirect_to :controller => '/meetings',
+                  :action => :show,
+                  :id => @meeting,
+                  :tab => @content_type.sub(/^meeting_/, '')
+      return
+    end
+    #go to an old version if a version id is given
+    @content = @content.at_version params[:id] unless params[:id].blank?
     render 'meeting_contents/show'
   end
 

data/app/controllers/meeting_minutes_controller.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 MeetingMinutesController < MeetingContentsController

data/app/controllers/meetings_controller.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 MeetingsController < ApplicationController

data/app/helpers/meeting_contents_helper.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.
 #++
 
 module MeetingContentsHelper

data/app/helpers/meetings_helper.rb

@@ -1,16 +1,30 @@
 #-- 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.
 #++
 
 module MeetingsHelper
   def format_participant_list(participants)
     participants.sort.collect{|p| link_to_user p.user}.join("; ").html_safe
   end
+
+  def render_meeting_journal(model, journal, options = {})
+    return "" if journal.initial?
+    journal_content = render_journal_details(journal, :label_updated_time_by, model, options)
+    content_tag "div", journal_content, { :id => "change-#{journal.id}", :class => "journal" }
+  end
 end

data/app/mailers/meeting_mailer.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 MeetingMailer < UserMailer

data/app/models/journal/meeting_content_journal.rb

@@ -0,0 +1,40 @@
+#-- encoding: UTF-8
+#-- 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.
+#++
+
+class Journal::MeetingContentJournal < ActiveRecord::Base
+  self.table_name = "meeting_content_journals"
+
+  belongs_to :journal
+  belongs_to :meeting
+  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+
+  @@journaled_attributes = [:meeting_id,
+                            :author_id,
+                            :text,
+                            :locked]
+
+  def journaled_attributes
+    attributes.symbolize_keys.select{|k,_| @@journaled_attributes.include? k}
+  end
+
+  def editable?
+    false
+  end
+end

data/app/models/journal/meeting_journal.rb

@@ -0,0 +1,38 @@
+#-- encoding: UTF-8
+#-- 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.
+#++
+
+class Journal::MeetingJournal < ActiveRecord::Base
+  self.table_name = "meeting_journals"
+
+  belongs_to :journal
+  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+
+  @@journaled_attributes = [:title,
+                            :author_id,
+                            :project_id,
+                            :location,
+                            :start_time,
+                            :duration]
+
+  def journaled_attributes
+    attributes.symbolize_keys.select{|k,_| @@journaled_attributes.include? k}
+  end
+
+end

data/app/models/meeting.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 Meeting < ActiveRecord::Base
@@ -34,8 +42,11 @@ class Meeting < ActiveRecord::Base
                      :date_column => "#{table_name}.created_at"
 
   acts_as_journalized :activity_find_options => {:include => [:agenda, :author, :project]},
-                      :event_title => Proc.new {|o| "#{l :label_meeting}: #{o.title} (#{format_date o.start_time} #{format_time o.start_time, false}-#{format_time o.end_time, false})"},
-                      :event_url => Proc.new {|o| {:controller => '/meetings', :action => 'show', :id => o.journaled}}
+                      :event_title => Proc.new {|o| "#{l :label_meeting}: #{o.journal.journable.title} \
+                      (#{format_date o.journal.journable.start_time} \
+                        #{format_time o.journal.journable.start_time, false}-#{format_time o.journal.journable.end_time, false})"},
+                      :event_url => Proc.new {|o| {:controller => '/meetings', :action => 'show', :id => o.journal.journable}},
+                      :event_author => Proc.new {|o| o.journal.user}
 
   register_on_journal_formatter(:plaintext, 'title')
   register_on_journal_formatter(:fraction, 'duration')
@@ -133,7 +144,7 @@ class Meeting < ActiveRecord::Base
 
   def close_agenda_and_copy_to_minutes!
     self.agenda.lock!
-    self.create_minutes(:text => agenda.text)
+    self.create_minutes(:text => agenda.text, :comment => "Minutes created")
   end
 
   alias :original_participants_attributes= :participants_attributes=

data/app/models/meeting_agenda.rb

@@ -1,26 +1,24 @@
 #-- 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 MeetingAgenda < 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_agenda}: #{o.meeting.title}"},
-    :event_url => Proc.new {|o| {:controller => '/meetings', :action => 'show', :id => o.meeting}}
-
-  def activity_type
-    'meetings'
-  end
-
   # TODO: internationalize the comments
   def lock!(user = User.current)
     self.comment = "Agenda closed"
@@ -39,57 +37,4 @@ class MeetingAgenda < MeetingContent
   def editable?
     !locked?
   end
-
-  MeetingAgendaJournal.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)
-      # 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