decidim-meetings 0.11.2 → 0.12.0.pre

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

@@ -9,10 +9,14 @@ module Decidim
         helper_method :meeting, :blank_service
 
         def new
+          enforce_permission_to :copy, :meeting, meeting: meeting
+
           @form = form(MeetingCopyForm).from_model(meeting)
         end
 
         def create
+          enforce_permission_to :copy, :meeting, meeting: meeting
+
           @form = form(MeetingCopyForm).from_params(params, current_component: current_component)
 
           CopyMeeting.call(@form, meeting) do

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

@@ -8,10 +8,14 @@ module Decidim
         helper_method :blank_service
 
         def new
+          enforce_permission_to :create, :meeting
+
           @form = form(MeetingForm).instance
         end
 
         def create
+          enforce_permission_to :create, :meeting
+
           @form = form(MeetingForm).from_params(params, current_component: current_component)
 
           CreateMeeting.call(@form) do
@@ -28,10 +32,14 @@ module Decidim
         end
 
         def edit
+          enforce_permission_to :update, :meeting, meeting: meeting
+
           @form = form(MeetingForm).from_model(meeting)
         end
 
         def update
+          enforce_permission_to :update, :meeting, meeting: meeting
+
           @form = form(MeetingForm).from_params(params, current_component: current_component)
 
           UpdateMeeting.call(@form, meeting) do
@@ -48,6 +56,8 @@ module Decidim
         end
 
         def destroy
+          enforce_permission_to :destroy, :meeting, meeting: meeting
+
           DestroyMeeting.call(meeting, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("meetings.destroy.success", scope: "decidim.meetings.admin")

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

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This controller allows an admin to manage minutes from a Meeting
+      class MinutesController < Admin::ApplicationController
+        helper_method :current_meeting, :minutes
+
+        def new
+          enforce_permission_to :create, :minutes, meeting: current_meeting
+
+          @form = form(MinutesForm).instance
+        end
+
+        def create
+          enforce_permission_to :create, :minutes, meeting: current_meeting
+
+          @form = form(MinutesForm).from_params(params)
+
+          CreateMinutes.call(@form, current_meeting) do
+            on(:ok) do
+              flash[:notice] = I18n.t("minutes.create.success", scope: "decidim.meetings.admin")
+              redirect_to meetings_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("minutes.create.invalid", scope: "decidim.meetings.admin")
+              render action: "new"
+            end
+          end
+        end
+
+        def edit
+          enforce_permission_to :update, :minutes, minutes: minutes, meeting: current_meeting
+
+          @form = form(MinutesForm).from_model(minutes)
+        end
+
+        def update
+          enforce_permission_to :update, :minutes, minutes: minutes, meeting: current_meeting
+
+          @form = form(MinutesForm).from_params(params)
+          UpdateMinutes.call(@form, current_meeting, minutes) do
+            on(:ok) do
+              flash[:notice] = I18n.t("minutes.update.success", scope: "decidim.meetings.admin")
+              redirect_to meetings_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("minutes.update.invalid", scope: "decidim.meetings.admin")
+              render action: "edit"
+            end
+          end
+        end
+
+        private
+
+        def current_meeting
+          @current_meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
+        end
+
+        def minutes
+          @minutes ||= Minutes.where(meeting: current_meeting).find(params[:id])
+        end
+      end
+    end
+  end
+end

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

@@ -6,10 +6,14 @@ module Decidim
       # This controller allows an admin to manage meeting registrations from a Participatory Process
       class RegistrationsController < Admin::ApplicationController
         def edit
+          enforce_permission_to :update, :meeting, meeting: meeting
+
           @form = MeetingRegistrationsForm.from_model(meeting)
         end
 
         def update
+          enforce_permission_to :update, :meeting, meeting: meeting
+
           @form = MeetingRegistrationsForm.from_params(params).with_context(current_organization: meeting.organization, meeting: meeting)
 
           UpdateRegistrations.call(@form, meeting) do
@@ -26,6 +30,8 @@ module Decidim
         end
 
         def export
+          enforce_permission_to :export_registrations, :meeting, meeting: meeting
+
           ExportMeetingRegistrations.call(meeting, params[:format], current_user) do
             on(:ok) do |export_data|
               send_data export_data.read, type: "text/#{export_data.extension}", filename: export_data.filename("registrations")

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

@@ -22,6 +22,12 @@ module Decidim
         end
       end
 
+      def show
+        return if meeting.current_user_can_visit_meeting?(current_user)
+        flash[:alert] = I18n.t("meeting.not_allowed", scope: "decidim.meetings")
+        redirect_to action: "index"
+      end
+
       private
 
       def meeting
@@ -29,7 +35,7 @@ module Decidim
       end
 
       def meetings
-        @meetings ||= paginate(search.results)
+        @meetings ||= paginate(search.results).visible_meeting_for(current_user)
       end
 
       def geocoded_meetings

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

@@ -5,33 +5,33 @@ module Decidim
     # Exposes the registration resource so users can join and leave meetings.
     class RegistrationsController < Decidim::Meetings::ApplicationController
       def create
-        authorize! :join, meeting
+        enforce_permission_to :join, :meeting, meeting: meeting
 
         JoinMeeting.call(meeting, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("registrations.create.success", scope: "decidim.meetings")
-            redirect_to meeting_path(meeting)
+            redirect_after_path
           end
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("registrations.create.invalid", scope: "decidim.meetings")
-            redirect_to meeting_path(meeting)
+            redirect_after_path
           end
         end
       end
 
       def destroy
-        authorize! :leave, meeting
+        enforce_permission_to :leave, :meeting, meeting: meeting
 
         LeaveMeeting.call(meeting, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("registrations.destroy.success", scope: "decidim.meetings")
-            redirect_to meeting_path(meeting)
+            redirect_after_path
           end
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("registrations.destroy.invalid", scope: "decidim.meetings")
-            redirect_to meeting_path(meeting)
+            redirect_after_path
           end
         end
       end
@@ -41,6 +41,12 @@ module Decidim
       def meeting
         @meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
       end
+
+      def redirect_after_path
+        referer = request.headers["Referer"]
+        return redirect_to(meeting_path(meeting)) if referer =~ /invitation_token/
+        redirect_back fallback_location: meeting_path(meeting)
+      end
     end
   end
 end

data/app/forms/decidim/meetings/admin/meeting_agenda_form.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This class holds a Form to update meeting agenda items
+      class MeetingAgendaForm < Decidim::Form
+        include TranslatableAttributes
+
+        translatable_attribute :title, String
+        attribute :agenda_items, Array[MeetingAgendaItemsForm]
+        attribute :visible, Boolean
+
+        validates :title, translatable_presence: true
+        validate :agenda_duration_too_long
+        validate :agenda_items_duration_too_long
+
+        def map_model(model)
+          self.agenda_items = model.agenda_items.first_class.map do |agenda_item|
+            MeetingAgendaItemsForm.from_model(agenda_item)
+          end
+        end
+
+        private
+
+        def meeting
+          @meeting ||= context[:meeting]
+        end
+
+        def agenda_duration_too_long
+          if agenda_duration > meeting.meeting_duration
+            difference = agenda_duration - meeting.meeting_duration
+            errors.add(:base, :too_many_minutes, count: difference)
+          end
+        end
+
+        def agenda_duration
+          @agenda_duration ||= agenda_items.sum(&:duration)
+        end
+
+        def agenda_items_duration_too_long
+          agenda_items.each do |agenda_item|
+            children_duration = agenda_item.agenda_item_children.sum(&:duration)
+
+            if children_duration > agenda_item.duration
+              difference = children_duration - agenda_item.duration
+              errors.add(:base, :too_many_minutes_child, parent_title: translated_attribute(agenda_item.title), count: difference)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/meetings/admin/meeting_agenda_items_form.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This class holds a Form to update meeting agenda items
+      class MeetingAgendaItemsForm < Decidim::Form
+        include TranslatableAttributes
+
+        translatable_attribute :title, String
+        translatable_attribute :description, String
+
+        attribute :duration, Integer, default: 0
+        attribute :parent_id, Integer
+        attribute :position, Integer
+        attribute :deleted, Boolean, default: false
+        attribute :agenda_item_children, Array[MeetingAgendaItemsForm]
+
+        validates :title, translatable_presence: true, unless: :deleted
+        validates :position, numericality: { greater_than_or_equal_to: 0 }, unless: :deleted
+        validates :duration, presence: true, numericality: { greater_than_or_equal_to: 0 }
+
+        def to_param
+          id || "meeting-agenda-item-id"
+        end
+
+        def to_param_child
+          id || "meeting-agenda-item-child-id"
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/meetings/admin/meeting_copy_form.rb

@@ -19,6 +19,9 @@ module Decidim
         attribute :longitude, Float
         attribute :start_time, Decidim::Attributes::TimeWithZone
         attribute :end_time, Decidim::Attributes::TimeWithZone
+        attribute :private_meeting, Boolean
+        attribute :transparent, Boolean
+        attribute :organizer_id, Integer
         attribute :services, Array[MeetingServiceForm]
 
         mimic :meeting
@@ -32,6 +35,7 @@ module Decidim
         validates :address, geocoding: true, if: -> { Decidim.geocoder.present? }
         validates :start_time, presence: true, date: { before: :end_time }
         validates :end_time, presence: true, date: { after: :start_time }
+        validates :organizer, presence: true, if: ->(form) { form.organizer_id.present? }
 
         def map_model(model)
           self.services = model.services.map do |service|
@@ -48,6 +52,10 @@ module Decidim
         end
 
         alias component current_component
+
+        def organizer
+          @organizer ||= current_organization.users.find_by(id: organizer_id)
+        end
       end
     end
   end

data/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -20,6 +20,9 @@ module Decidim
         attribute :services, Array[MeetingServiceForm]
         attribute :decidim_scope_id, Integer
         attribute :decidim_category_id, Integer
+        attribute :private_meeting, Boolean
+        attribute :transparent, Boolean
+        attribute :organizer_id, Integer
 
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
@@ -32,6 +35,7 @@ module Decidim
         validates :current_component, presence: true
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
+        validates :organizer, presence: true, if: ->(form) { form.organizer_id.present? }
 
         validate :scope_belongs_to_participatory_space_scope
 
@@ -53,6 +57,10 @@ module Decidim
           services.size
         end
 
+        def organizer
+          @organizer ||= current_organization.users.find_by(id: organizer_id)
+        end
+
         alias component current_component
 
         # Finds the Scope from the given decidim_scope_id, uses participatory space scope if missing.

data/app/forms/decidim/meetings/admin/meeting_registration_invite_form.rb

@@ -9,7 +9,8 @@ module Decidim
         attribute :name, String
         attribute :email, String
 
-        validates :name, :email, presence: true
+        validates :name, presence: true
+        validates :email, presence: true, 'valid_email_2/email': { disposable: true }
       end
     end
   end

data/app/forms/decidim/meetings/admin/minutes_form.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This class holds a Form to create/update minutes from Decidim's admin panel.
+      class MinutesForm < Decidim::Form
+        include TranslatableAttributes
+
+        translatable_attribute :description, String
+
+        attribute :video_url, String
+        attribute :audio_url, String
+        attribute :visible, Boolean
+
+        validates :description, translatable_presence: true
+      end
+    end
+  end
+end

data/app/helpers/decidim/meetings/admin/application_helper.rb

@@ -8,9 +8,22 @@ module Decidim
       module ApplicationHelper
         include Decidim::MapHelper
 
+        def meeting_organizer_picker_text(form)
+          return "" if form.object.organizer.blank?
+          "#{form.object.organizer.name} (@#{form.object.organizer.nickname})"
+        end
+
         def tabs_id_for_service(service)
           "meeting_service_#{service.to_param}"
         end
+
+        def tabs_id_for_agenda_item(agenda_item)
+          "meeting_agenda_item_#{agenda_item.to_param}"
+        end
+
+        def tabs_id_for_agenda_item_child(agenda_item)
+          "meeting_agenda_item_#{agenda_item.to_param_child}"
+        end
       end
     end
   end

data/{lib/decidim/meetings/view_model.rb → app/helpers/decidim/meetings/meeting_cells_helper.rb}

@@ -2,11 +2,17 @@
 
 module Decidim
   module Meetings
-    class ViewModel < Decidim::ViewModel
+    # Custom helpers used in meetings views
+    module MeetingCellsHelper
       include TranslatableAttributes
       include LayoutHelper
       include Decidim::Meetings::MeetingsHelper
       include Decidim::SanitizeHelper
+      include Decidim::Meetings::Engine.routes.url_helpers
+
+      def description
+        decidim_sanitize meeting_description(model)
+      end
     end
   end
 end