decidim-meetings 0.26.9 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c917ec730da94af14398a8e5b148893b135e27c7766f9a4bb5a83ed3853a3871
-  data.tar.gz: 75c3d7620035011edc919e580dab97b6c74397dbe8cc3737205e512a41035428
+  metadata.gz: b2e4b36460093e94bb94d1ce24af9b4de7a2d01249442d756fec1205d3424365
+  data.tar.gz: f26624e63578541e587f75b91a7db9e8b510494d60cbfa14509e1b83d27bfc3f
 SHA512:
-  metadata.gz: aa2c4e2c977c59f1ed758739b8952e60a3780ea6b1cc33abe0f9425be06bcbe8dce4e85d2ea4d35e8a28c3304a70c636bdb0975f61749c3ec97fd162d9325fc0
-  data.tar.gz: 67ab02377dd9e73bbd818062ed36517085488f9643955e1b915ca28d976df8c79e1b5e0581ca19abbd72286a6e0592e2d7d69dc1ffc45a22525d47f1e1b90cf0
+  metadata.gz: 113676fde0b436b66b9c1763168805aafacf2a3c722bb34dfa47ef18280c5ecfefff5502945349b133db82ddddb15ea76da60d92baceba6bc986ffdceeb818e7
+  data.tar.gz: 5189a4a63c6cad6c1d4789bfdb0605c7ec41ae5bee5ed9808a3ad9f8c473bce7d266fc4b6053841bdb9b68007dde984646ee63743ba1566ae78c62e27f112845

data/app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb

@@ -10,7 +10,7 @@ module Decidim
             .published
             .not_hidden
             .upcoming
-            .visible_meeting_for(current_user)
+            .visible_for(current_user)
             .where(component: published_components)
         end
 

data/app/cells/decidim/meetings/content_blocks/upcoming_meetings/show.erb

@@ -1,4 +1,4 @@
-<section class="wrapper-home upcoming-meetings home-section">
+<section id="upcoming_meetings" class="wrapper-home upcoming-meetings home-section">
   <div class="row">
     <h3 class="section-heading"><%= t("decidim.meetings.content_blocks.upcoming_meetings.upcoming_meetings") %></h3>
     <div class="row">
@@ -8,7 +8,7 @@
         <% end %>
       </div>
       <div class="columns medium-6">
-        <% if show_map? %>
+        <% if geolocation_enabled? %>
           <%= cell "decidim/meetings/meetings_map", upcoming_meetings %>
         <% else %>
           <% (upcoming_meetings - upcoming_meetings.first(4)).each do |event| %>

data/app/cells/decidim/meetings/content_blocks/upcoming_meetings_cell.rb

@@ -14,9 +14,9 @@ module Decidim
 
         def upcoming_meetings
           @upcoming_meetings ||= Decidim::Meetings::Meeting
-                                 .includes(component: :participatory_space)
+                                 .includes(:author, component: :participatory_space)
                                  .where(component: meeting_components)
-                                 .visible_meeting_for(current_user)
+                                 .visible_for(current_user)
                                  .published
                                  .where("end_time >= ?", Time.current)
                                  .except_withdrawn
@@ -25,18 +25,10 @@ module Decidim
                                  .limit(limit)
         end
 
-        def show_map?
-          maps_active? && !all_online_meetings?
-        end
-
-        def maps_active?
+        def geolocation_enabled?
           Decidim::Map.available?(:geocoding)
         end
 
-        def all_online_meetings?
-          upcoming_meetings.collect(&:type_of_meeting).all?("online")
-        end
-
         def meetings_directory_path
           Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path
         end
@@ -44,7 +36,7 @@ module Decidim
         private
 
         def limit
-          maps_active? ? 4 : 8
+          geolocation_enabled? ? 4 : 8
         end
 
         def meeting_components

data/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb

@@ -22,7 +22,7 @@ module Decidim
                                                 .except_withdrawn
                                                 .published
                                                 .not_hidden
-                                                .visible_meeting_for(current_user)
+                                                .visible_for(current_user)
       end
 
       def past_meetings
@@ -44,6 +44,15 @@ module Decidim
       def upcoming_meetings_count
         @upcoming_meetings_count ||= meetings.upcoming.count
       end
+
+      def cache_hash
+        hash = []
+        hash << "decidim/meetings/highlighted_meetings_for_component"
+        hash << meetings.cache_key_with_version
+        hash.push(current_user.try(:id))
+        hash << I18n.locale.to_s
+        hash.join(Decidim.cache_key_separator)
+      end
     end
   end
 end

data/app/cells/decidim/meetings/meeting_list_item_cell.rb

@@ -28,7 +28,7 @@ module Decidim
       end
 
       def title
-        present(model).title(html_escape: true)
+        present(model).title
       end
 
       def resource_date_time

data/app/cells/decidim/meetings/meeting_m_cell.rb

@@ -24,7 +24,7 @@ module Decidim
       end
 
       def title
-        present(model).title(html_escape: true)
+        present(model).title
       end
 
       def description

data/app/cells/decidim/meetings/meeting_s_cell.rb

@@ -5,6 +5,8 @@ module Decidim
     # This cell renders the Small (:s) meeting card
     # for an given instance of a Meeting
     class MeetingSCell < MeetingMCell
+      delegate :title, to: :presenter
+
       def meeting_path
         resource_locator(model).path
       end
@@ -21,6 +23,10 @@ module Decidim
         resource_locator(model.component.participatory_space).path
       end
 
+      def presenter
+        @presenter ||= Decidim::Meetings::MeetingPresenter.new(model)
+      end
+
       private
 
       def cache_hash

data/app/commands/decidim/meetings/admin/close_meeting.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user closes a Meeting from the admin
       # panel.
-      class CloseMeeting < Rectify::Command
+      class CloseMeeting < Decidim::Command
         # Initializes a CloseMeeting Command.
         #
         # form - The form from which to get the data.

data/app/commands/decidim/meetings/admin/copy_meeting.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when copying a meeting
       # in the system.
-      class CopyMeeting < Rectify::Command
+      class CopyMeeting < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -44,8 +44,8 @@ module Decidim
           @copied_meeting = Decidim.traceability.create!(
             Meeting,
             form.current_user,
-            scope: form.scope,
-            category: form.category,
+            scope: meeting.scope,
+            category: meeting.category,
             title: parsed_title,
             description: parsed_description,
             end_time: form.end_time,
@@ -60,29 +60,10 @@ module Decidim
             transparent: form.transparent,
             author: form.current_organization,
             questionnaire: form.questionnaire,
-            online_meeting_url: form.online_meeting_url,
-            type_of_meeting: form.type_of_meeting,
-            iframe_embed_type: form.iframe_embed_type,
-            iframe_access_level: form.iframe_access_level,
-            comments_enabled: form.comments_enabled,
-            comments_start_time: form.comments_start_time,
-            comments_end_time: form.comments_end_time,
-            registration_type: form.registration_type,
-            registration_url: form.registration_url,
-            **fields_from_meeting
-          )
-        end
-
-        def fields_from_meeting
-          {
             registrations_enabled: meeting.registrations_enabled,
             available_slots: meeting.available_slots,
-            registration_terms: meeting.registration_terms,
-            reserved_slots: meeting.reserved_slots,
-            customize_registration_email: meeting.customize_registration_email,
-            registration_form_enabled: meeting.registration_form_enabled,
-            registration_email_custom_content: meeting.registration_email_custom_content
-          }
+            registration_terms: meeting.registration_terms
+          )
         end
 
         def copy_services!

data/app/commands/decidim/meetings/admin/create_agenda.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Meeting from the admin
       # panel.
-      class CreateAgenda < Rectify::Command
+      class CreateAgenda < Decidim::Command
         def initialize(form, meeting)
           @form = form
           @meeting = meeting

data/app/commands/decidim/meetings/admin/create_meeting.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Meeting from the admin
       # panel.
-      class CreateMeeting < Rectify::Command
+      class CreateMeeting < Decidim::Command
         def initialize(form)
           @form = form
         end
@@ -42,7 +42,6 @@ module Decidim
             online_meeting_url: form.online_meeting_url,
             registration_type: form.registration_type,
             registration_url: form.registration_url,
-            available_slots: form.available_slots,
             type_of_meeting: form.clean_type_of_meeting,
             address: form.address,
             latitude: form.latitude,
@@ -53,11 +52,8 @@ module Decidim
             transparent: form.transparent,
             author: form.current_organization,
             registration_terms: form.current_component.settings.default_registration_terms,
-            registrations_enabled: form.registrations_enabled,
             component: form.current_component,
             questionnaire: Decidim::Forms::Questionnaire.new,
-            customize_registration_email: form.customize_registration_email,
-            registration_email_custom_content: form.registration_email_custom_content,
             iframe_embed_type: form.iframe_embed_type,
             comments_enabled: form.comments_enabled,
             comments_start_time: form.comments_start_time,

data/app/commands/decidim/meetings/admin/destroy_meeting.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user destroys a Meeting from the admin
       # panel.
-      class DestroyMeeting < Rectify::Command
+      class DestroyMeeting < Decidim::Command
         # Initializes a CloseMeeting Command.
         #
         # meeting - The current instance of the page to be closed.

data/app/commands/decidim/meetings/admin/export_meeting_registrations.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user exports the registrations of
       # a Meeting from the admin panel.
-      class ExportMeetingRegistrations < Rectify::Command
+      class ExportMeetingRegistrations < Decidim::Command
         # meeting - The current instance of the page to be closed.
         # format - a string representing the export format
         # current_user - the user performing the action

data/app/commands/decidim/meetings/admin/invite_user_to_join_meeting.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic to invite users to join a meeting.
       #
-      class InviteUserToJoinMeeting < Rectify::Command
+      class InviteUserToJoinMeeting < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.
@@ -86,16 +86,14 @@ module Decidim
         end
 
         def user
-          @user ||= begin
-            if form.existing_user
-              form.user
-            else
-              Decidim::User.find_or_initialize_by(
-                organization: form.current_organization,
-                email: form.email.downcase
-              )
-            end
-          end
+          @user ||= if form.existing_user
+                      form.user
+                    else
+                      Decidim::User.find_or_initialize_by(
+                        organization: form.current_organization,
+                        email: form.email.downcase
+                      )
+                    end
         end
 
         def invite_user_to_sign_up

data/app/commands/decidim/meetings/admin/publish_meeting.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic that publishes an
       # existing meeting.
-      class PublishMeeting < Rectify::Command
+      class PublishMeeting < Decidim::Command
         # Public: Initializes the command.
         #
         # meeting - Decidim::Meetings::Meeting
@@ -26,7 +26,7 @@ module Decidim
 
           transaction do
             publish_meeting
-            send_notification unless meeting.previously_published?
+            send_notification
             schedule_upcoming_meeting_notification
           end
 

data/app/commands/decidim/meetings/admin/unpublish_meeting.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic that unpublishes an
       # existing meeting.
-      class UnpublishMeeting < Rectify::Command
+      class UnpublishMeeting < Decidim::Command
         # Public: Initializes the command.
         #
         # meeting - Decidim::Meetings::Meeting

data/app/commands/decidim/meetings/admin/update_agenda.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Meeting from the admin
       # panel.
-      class UpdateAgenda < Rectify::Command
+      class UpdateAgenda < Decidim::Command
         def initialize(form, agenda)
           @form = form
           @agenda = agenda

data/app/commands/decidim/meetings/admin/update_meeting.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Meeting from the admin
       # panel.
-      class UpdateMeeting < Rectify::Command
+      class UpdateMeeting < Decidim::Command
         # Initializes a UpdateMeeting Command.
         #
         # form - The form from which to get the data.
@@ -51,8 +51,6 @@ module Decidim
             online_meeting_url: form.online_meeting_url,
             registration_type: form.registration_type,
             registration_url: form.registration_url,
-            available_slots: form.available_slots,
-            registrations_enabled: form.registrations_enabled,
             type_of_meeting: form.clean_type_of_meeting,
             address: form.address,
             latitude: form.latitude,
@@ -61,8 +59,6 @@ module Decidim
             location_hints: form.location_hints,
             private_meeting: form.private_meeting,
             transparent: form.transparent,
-            customize_registration_email: form.customize_registration_email,
-            registration_email_custom_content: form.registration_email_custom_content,
             iframe_embed_type: form.iframe_embed_type,
             comments_enabled: form.comments_enabled,
             comments_start_time: form.comments_start_time,

data/app/commands/decidim/meetings/admin/update_question_status.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Questionnaire from the admin
       # panel.
-      class UpdateQuestionStatus < Rectify::Command
+      class UpdateQuestionStatus < Decidim::Command
         class InvalidStatus < StandardError; end
 
         # Initializes a UpdateQuestionnaire Command.

data/app/commands/decidim/meetings/admin/update_questionnaire.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Questionnaire from the admin
       # panel.
-      class UpdateQuestionnaire < Rectify::Command
+      class UpdateQuestionnaire < Decidim::Command
         # Initializes a UpdateQuestionnaire Command.
         #
         # form - The form from which to get the data.
@@ -21,12 +21,15 @@ module Decidim
         def call
           return broadcast(:invalid) if @form.invalid?
 
-          Decidim::Meetings::Questionnaire.transaction do
-            create_questionnaire_for
-            create_questionaire
-            if @questionnaire.questions_editable?
-              update_questionnaire_questions
-              delete_answers
+          Decidim.traceability.perform_action!("update", Decidim::Meetings::Questionnaire, @form.current_user, { meeting: @questionnaire.questionnaire_for.try(:meeting) }) do
+            Decidim::Meetings::Questionnaire.transaction do
+              create_questionnaire_for
+              create_questionaire
+              if @questionnaire.questions_editable?
+                update_questionnaire_questions
+                delete_answers
+              end
+              @questionnaire
             end
           end
 

data/app/commands/decidim/meetings/admin/update_registrations.rb

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     module Admin
       # This command is executed when the user updates the meeting registrations.
-      class UpdateRegistrations < Rectify::Command
+      class UpdateRegistrations < Decidim::Command
         # Initializes a UpdateRegistrations Command.
         #
         # form - The form from which to get the data.
@@ -18,9 +18,9 @@ module Decidim
         #
         # Broadcasts :ok if successful, :invalid otherwise.
         def call
-          meeting.with_lock do
-            return broadcast(:invalid) if form.invalid?
+          return broadcast(:invalid) if form.invalid?
 
+          meeting.with_lock do
             update_meeting_registrations
             send_notification if should_notify_followers?
           end
@@ -40,6 +40,8 @@ module Decidim
             meeting.available_slots = form.available_slots
             meeting.reserved_slots = form.reserved_slots
             meeting.registration_terms = form.registration_terms
+            meeting.customize_registration_email = form.customize_registration_email
+            meeting.registration_email_custom_content = form.registration_email_custom_content if form.customize_registration_email
           end
 
           meeting.save!

data/app/commands/decidim/meetings/admin/validate_registration_code.rb

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     module Admin
       # This command is executed when the admin validates a registration code in the admin panel.
-      class ValidateRegistrationCode < Rectify::Command
+      class ValidateRegistrationCode < Decidim::Command
         # Initializes a ValidateRegistrationCode Command.
         #
         # form - The form from which to get the data.

data/app/commands/decidim/meetings/close_meeting.rb

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # This command is executed when the user closes a Meeting from the public
     # views.
-    class CloseMeeting < Rectify::Command
+    class CloseMeeting < Decidim::Command
       # Initializes a CloseMeeting Command.
       #
       # form - The form from which to get the data.

data/app/commands/decidim/meetings/create_answer.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This command is executed when the user creates an Answer in a meeting poll.
-    class CreateAnswer < Rectify::Command
+    class CreateAnswer < Decidim::Command
       def initialize(form, current_user, questionnaire)
         @form = form
         @current_user = current_user

data/app/commands/decidim/meetings/create_meeting.rb

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # This command is executed when a participant or user group creates a Meeting from the public
     # views.
-    class CreateMeeting < Rectify::Command
+    class CreateMeeting < Decidim::Command
       def initialize(form)
         @form = form
       end

data/app/commands/decidim/meetings/decline_invitation.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This command is executed when the user declines an invite to the meeting.
-    class DeclineInvitation < Rectify::Command
+    class DeclineInvitation < Decidim::Command
       # Initializes a DeclineInvitation Command.
       #
       # meeting - The current instance of the meeting where user has been invited.

data/app/commands/decidim/meetings/join_meeting.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This command is executed when the user joins a meeting.
-    class JoinMeeting < Rectify::Command
+    class JoinMeeting < Decidim::Command
       # Initializes a JoinMeeting Command.
       #
       # meeting - The current instance of the meeting to be joined.
@@ -21,12 +21,11 @@ module Decidim
       #
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
-        meeting.with_lock do
-          return broadcast(:invalid) unless can_join_meeting?
-          return broadcast(:invalid_form) unless registration_form.valid?
-
-          return broadcast(:invalid) if answer_questionnaire == :invalid
+        return broadcast(:invalid) unless can_join_meeting?
+        return broadcast(:invalid_form) unless registration_form.valid?
+        return broadcast(:invalid) if answer_questionnaire == :invalid
 
+        meeting.with_lock do
           create_registration
           accept_invitation
           send_email_confirmation
@@ -132,7 +131,7 @@ module Decidim
       end
 
       def questionnaire?
-        registration_form.model_name == "Questionnaire"
+        registration_form.model_name == "questionnaire"
       end
     end
   end

data/app/commands/decidim/meetings/leave_meeting.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This command is executed when the user leaves a meeting.
-    class LeaveMeeting < Rectify::Command
+    class LeaveMeeting < Decidim::Command
       # Initializes a LeaveMeeting Command.
       #
       # meeting - The current instance of the meeting to be left.
@@ -18,9 +18,9 @@ module Decidim
       #
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
-        @meeting.with_lock do
-          return broadcast(:invalid) unless registration
+        return broadcast(:invalid) unless registration
 
+        @meeting.with_lock do
           destroy_registration
           destroy_questionnaire_answers
           decrement_score

data/app/commands/decidim/meetings/update_meeting.rb

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # This command is executed when the user changes a Meeting from the admin
     # panel.
-    class UpdateMeeting < Rectify::Command
+    class UpdateMeeting < Decidim::Command
       # Initializes a UpdateMeeting Command.
       #
       # form - The form from which to get the data.

data/app/commands/decidim/meetings/withdraw_meeting.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # A command with all the business logic when a user withdraws a new proposal.
-    class WithdrawMeeting < Rectify::Command
+    class WithdrawMeeting < Decidim::Command
       # Public: Initializes the command.
       #
       # meeting     - The meeting to withdraw.

data/app/controllers/concerns/decidim/meetings/admin/filterable.rb

@@ -21,23 +21,23 @@ module Decidim
 
           def filters
             [
-              :type_eq,
+              :with_any_type,
               :is_upcoming_true,
               :scope_id_eq,
               :category_id_eq,
-              :origin_eq,
+              :with_any_origin,
               :closed_at_present
             ]
           end
 
           def filters_with_values
             {
-              type_eq: meeting_types,
+              with_any_type: meeting_types,
               scope_id_eq: scope_ids_hash(scopes.top_level),
               category_id_eq: category_ids_hash(categories.first_class),
               closed_at_present: %w(true false),
               is_upcoming_true: %w(true false),
-              origin_eq: %w(citizen official user_group)
+              with_any_origin: %w(participants official user_group)
             }
           end
 

data/app/controllers/concerns/decidim/meetings/filterable.rb

@@ -15,14 +15,8 @@ module Decidim
           %w(all) + Decidim::Meetings::Meeting::TYPE_OF_MEETING
         end
 
-        def default_search_params
-          {
-            scope: Meeting.not_hidden.visible_meeting_for(current_user)
-          }
-        end
-
         def default_filter_origin_params
-          filter_origin_params = %w(citizens)
+          filter_origin_params = %w(participants)
           filter_origin_params << "official"
           filter_origin_params << "user_group" if current_organization.user_groups_enabled?
           filter_origin_params

data/app/controllers/decidim/meetings/admin/meeting_copies_controller.rb

@@ -11,13 +11,13 @@ module Decidim
         def new
           enforce_permission_to :copy, :meeting, meeting: meeting
 
-          @form = form(MeetingForm).from_model(meeting)
+          @form = form(MeetingCopyForm).from_model(meeting)
         end
 
         def create
           enforce_permission_to :copy, :meeting, meeting: meeting
 
-          @form = form(MeetingForm).from_params(params, current_component: current_component)
+          @form = form(MeetingCopyForm).from_params(params, current_component: current_component)
 
           CopyMeeting.call(@form, meeting) do
             on(:ok) do

data/app/controllers/decidim/meetings/calendars_controller.rb

@@ -11,7 +11,7 @@ module Decidim
       skip_around_action :use_organization_time_zone
 
       def show
-        render plain: CalendarRenderer.for(current_component), content_type: "type/calendar"
+        render plain: CalendarRenderer.for(current_component, params[:filter]), content_type: "type/calendar"
       end
 
       def meeting_calendar