decidim-conferences 0.17.2 → 0.20.0

data/app/controllers/decidim/conferences/conference_program_controller.rb

@@ -11,7 +11,8 @@ module Decidim
       helper_method :collection, :conference, :meeting_days, :meeting_component
 
       def show
-        raise ActionController::RoutingError, "No meetings for this conference " if meetings.empty?
+        raise ActionController::RoutingError, "No meetings for this conference " if meetings.blank?
+
         enforce_permission_to :list, :program
         redirect_to decidim_conferences.conference_path(current_participatory_space) unless current_user_can_visit_space?
       end
@@ -20,11 +21,13 @@ module Decidim
 
       def meeting_component
         return if params[:id].blank?
+
         @meeting_component ||= current_participatory_space.components.where(manifest_name: "meetings").find_by(id: params[:id])
       end
 
       def meetings
         return unless meeting_component.published? || !meeting_component.presence
+
         @meetings ||= Decidim::Meetings::Meeting.where(component: meeting_component).visible_meeting_for(current_user).order(:start_time)
       end
 

data/app/controllers/decidim/conferences/conference_registrations_controller.rb

@@ -65,6 +65,7 @@ module Decidim
       def redirect_after_path
         referer = request.headers["Referer"]
         return redirect_to(conference_path(conference)) if referer =~ /invitation_token/
+
         redirect_back fallback_location: conference_path(conference)
       end
     end

data/app/controllers/decidim/conferences/conference_speakers_controller.rb

@@ -11,6 +11,7 @@ module Decidim
 
       def index
         raise ActionController::RoutingError, "No speakers for this conference " if speakers.empty?
+
         enforce_permission_to :list, :speakers
         redirect_to decidim_conferences.conference_path(current_participatory_space) unless current_user_can_visit_space?
       end

data/app/controllers/decidim/conferences/media_controller.rb

@@ -13,6 +13,7 @@ module Decidim
 
       def index
         raise ActionController::RoutingError, "No media_links for this conference " if media_links.empty? && current_participatory_space.attachments.empty?
+
         enforce_permission_to :list, :media_links
         redirect_to decidim_conferences.conference_path(current_participatory_space) unless current_user_can_visit_space?
       end

data/app/controllers/decidim/conferences/registration_types_controller.rb

@@ -11,6 +11,7 @@ module Decidim
 
       def index
         raise ActionController::RoutingError, "No registration types for this conference " if registration_types.empty? && current_participatory_space.registrations_enabled.empty?
+
         enforce_permission_to :list, :registration_types
         redirect_to decidim_conferences.conference_path(current_participatory_space) unless current_user_can_visit_space?
       end

data/app/forms/decidim/conferences/admin/conference_form.rb

@@ -62,6 +62,7 @@ module Decidim
 
         def processes_for_select
           return unless Decidim.participatory_space_manifests.map(&:name).include?(:participatory_processes)
+
           @processes_for_select ||= Decidim.find_participatory_space_manifest(:participatory_processes)
                                            .participatory_spaces.call(current_organization)&.order(title: :asc)&.map do |process|
             [
@@ -73,6 +74,7 @@ module Decidim
 
         def assemblies_for_select
           return unless Decidim.participatory_space_manifests.map(&:name).include?(:assemblies)
+
           @assemblies_for_select ||= Decidim.find_participatory_space_manifest(:assemblies)
                                             .participatory_spaces.call(current_organization)&.order(title: :asc)&.map do |assembly|
             [
@@ -84,6 +86,7 @@ module Decidim
 
         def consultations_for_select
           return unless Decidim.participatory_space_manifests.map(&:name).include?(:consultations)
+
           @consultations_for_select ||= Decidim.find_participatory_space_manifest(:consultations)
                                                .participatory_spaces.call(current_organization)&.order(title: :asc)&.map do |consultation|
             [
@@ -98,6 +101,7 @@ module Decidim
         def available_slots_greater_than_or_equal_to_registrations_count
           conference = OrganizationConferences.new(current_organization).query.find_by(slug: slug)
           return true if conference.blank?
+
           errors.add(:available_slots, :invalid) if available_slots < conference.conference_registrations.count
         end
 

data/app/forms/decidim/conferences/admin/conference_speaker_form.rb

@@ -50,6 +50,7 @@ module Decidim
         def conference_meetings
           meeting_components = current_participatory_space.components.where(manifest_name: "meetings")
           return unless meeting_components || conference_meeting_ids.delete("").present?
+
           @conference_meetings ||= Decidim::ConferenceMeeting.where(component: meeting_components).where(id: conference_meeting_ids)
         end
 

data/app/forms/decidim/conferences/admin/registration_type_form.rb

@@ -36,6 +36,7 @@ module Decidim
         def conference_meetings
           meeting_components = current_participatory_space.components.where(manifest_name: "meetings")
           return unless meeting_components || conference_meeting_ids.delete("").present?
+
           @conference_meetings ||= Decidim::ConferenceMeeting.where(component: meeting_components).where(id: conference_meeting_ids)
         end
       end

data/app/helpers/decidim/conferences/conference_helper.rb

@@ -8,6 +8,7 @@ module Decidim
       #
       def render_date(conference)
         return l(conference.start_date, format: :decidim_with_month_name_short) if conference.start_date == conference.end_date
+
         "#{l(conference.start_date, format: :decidim_with_month_name_short)} - #{l(conference.end_date, format: :decidim_with_month_name_short)}"
       end
     end

data/app/models/decidim/conference.rb

@@ -16,14 +16,12 @@ module Decidim
     include Decidim::Traceable
     include Decidim::Loggable
     include Decidim::ParticipatorySpaceResourceable
+    include Decidim::Searchable
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization"
-    belongs_to :area,
-               foreign_key: "decidim_area_id",
-               class_name: "Decidim::Area",
-               optional: true
+
     has_many :categories,
              foreign_key: "decidim_participatory_space_id",
              foreign_type: "decidim_participatory_space_type",
@@ -58,6 +56,18 @@ module Decidim
     mount_uploader :main_logo, Decidim::Conferences::DiplomaUploader
     mount_uploader :signature, Decidim::Conferences::DiplomaUploader
 
+    searchable_fields({
+                        scope_id: :decidim_scope_id,
+                        participatory_space: :itself,
+                        A: :title,
+                        B: :slogan,
+                        C: :short_description,
+                        D: [:description, :objectives],
+                        datetime: :published_at
+                      },
+                      index_on_create: ->(_conference) { false },
+                      index_on_update: ->(conference) { conference.visible? })
+
     # Scope to return only the promoted conferences.
     #
     # Returns an ActiveRecord::Relation.
@@ -87,6 +97,7 @@ module Decidim
 
     def has_available_slots?
       return true if available_slots.zero?
+
       available_slots > conference_registrations.count
     end
 
@@ -96,7 +107,14 @@ module Decidim
 
     def diploma_sent?
       return false if diploma_sent_at.nil?
+
       true
     end
+
+    def closed?
+      return false if end_date.blank?
+
+      end_date < Date.current
+    end
   end
 end

data/app/models/decidim/conference_user_role.rb

@@ -24,6 +24,7 @@ module Decidim
     # Private: check if the process and the user have the same organization
     def user_and_conference_same_organization
       return if !conference || !user
+
       errors.add(:conference, :invalid) unless user.organization == conference.organization
     end
   end

data/app/permissions/decidim/conferences/permissions.rb

@@ -30,6 +30,7 @@ module Decidim
         end
 
         return permission_action unless user
+
         if !has_manageable_conferences? && !user.admin?
           disallow!
           return permission_action
@@ -94,12 +95,14 @@ module Decidim
       # Checks if it has any manageable conference, with any possible role.
       def has_manageable_conferences?(role: :any)
         return unless user
+
         conferences_with_role_privileges(role).any?
       end
 
       # Whether the user can manage the given conference or not.
       def can_manage_conference?(role: :any)
         return unless user
+
         conferences_with_role_privileges(role).include? conference
       end
 
@@ -123,6 +126,7 @@ module Decidim
 
         return allow! if user&.admin?
         return allow! if conference.published?
+
         toggle_allow(can_manage_conference?)
       end
 
@@ -222,12 +226,14 @@ module Decidim
       # Everyone can read the conference list
       def user_can_read_conference_list?
         return unless read_conference_list_permission_action?
+
         toggle_allow(user.admin? || has_manageable_conferences?)
       end
 
       def user_can_read_current_conference?
         return unless read_conference_list_permission_action?
         return if permission_action.subject == :conference_list
+
         toggle_allow(user.admin? || can_manage_conference?)
       end
 

data/app/presenters/decidim/conferences/admin_log/value_types/role_presenter.rb

@@ -13,6 +13,7 @@ module Decidim
           # Returns an HTML-safe String.
           def present
             return if value.blank?
+
             h.t(value, scope: "decidim.admin.models.conference_user_role.roles", default: value)
           end
         end

data/app/presenters/decidim/log/value_types/conference_presenter.rb

@@ -14,6 +14,7 @@ module Decidim
         def present
           return unless value
           return h.translated_attribute(conference.title) if conference
+
           I18n.t("not_found", id: value, scope: "decidim.log.value_types.conference_presenter")
         end
 

data/app/queries/decidim/conferences/admin/admin_users.rb

@@ -23,7 +23,7 @@ module Decidim
         #
         # Returns an ActiveRecord::Relation.
         def query
-          Decidim::User.where(id: organization_admins)
+          Decidim::User.where(id: organization_admins).or(conference_user_admins)
         end
 
         private
@@ -33,6 +33,13 @@ module Decidim
         def organization_admins
           conference.organization.admins
         end
+
+        def conference_user_admins
+          conference_user_admin_ids = Decidim::ConferenceUserRole
+                                      .where(conference: conference, role: :admin)
+                                      .pluck(:decidim_user_id)
+          Decidim::User.where(id: conference_user_admin_ids)
+        end
       end
     end
   end

data/app/queries/decidim/conferences/admin/conference_invites.rb

@@ -36,6 +36,7 @@ module Decidim
 
         def filter_by_search(conference_invites)
           return conference_invites if @query.blank?
+
           conference_invites.joins(:user).where(
             User.arel_table[:name].lower.matches("%#{@query}%").or(User.arel_table[:email].lower.matches("%#{@query}%"))
           )

data/app/queries/decidim/conferences/admin/conference_speakers.rb

@@ -32,6 +32,7 @@ module Decidim
 
         def filter_by_search(conference_speakers)
           return conference_speakers if @query.blank?
+
           conference_speakers.where("LOWER(full_name) LIKE LOWER(?)", "%#{@query}%")
         end
       end

data/app/views/decidim/conferences/admin/conference_speakers/index.html.erb

@@ -63,6 +63,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @conference_speakers, theme: "decidim" %>
     </div>
   </div>
 </div>

data/app/views/decidim/conferences/admin/conference_user_roles/index.html.erb

@@ -25,10 +25,10 @@
           <% @conference_user_roles.each do |role| %>
             <tr>
               <td>
-                <%= role.user.name %><br />
+                <%= role.user.name %><br>
               </td>
               <td>
-                <%= role.user.email %><br />
+                <%= role.user.email %><br>
               </td>
               <td>
                 <% if role.user.invitation_sent_at %>
@@ -41,7 +41,7 @@
                 <% end %>
               </td>
               <td>
-                <%= t("#{role.role}", scope: "decidim.admin.models.conference_user_role.roles") %><br />
+                <%= t("#{role.role}", scope: "decidim.admin.models.conference_user_role.roles") %><br>
               </td>
               <td class="table-list__actions">
                 <% if allowed_to?(:invite, :conference_user_role, user_role: role) && role.user.invited_to_sign_up? %>
@@ -60,6 +60,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @conference_user_roles, theme: "decidim" %>
     </div>
   </div>
 </div>

data/app/views/decidim/conferences/admin/conferences/index.html.erb

@@ -26,11 +26,11 @@
                   </span>
                 <% end %>
                 <% if allowed_to? :update, :conference, conference: conference %>
-                  <%= link_to translated_attribute(conference.title), edit_conference_path(conference) %><br />
+                  <%= link_to translated_attribute(conference.title), edit_conference_path(conference) %><br>
                 <% elsif allowed_to? :preview, :conference, conference: conference %>
-                  <%= link_to translated_attribute(conference.title), decidim_conferences.conference_path(conference) %><br />
+                  <%= link_to translated_attribute(conference.title), decidim_conferences.conference_path(conference) %><br>
                 <% elsif allowed_to? :read, :moderation, conference: conference %>
-                  <%= link_to translated_attribute(conference.title), moderations_path(conference) %><br />
+                  <%= link_to translated_attribute(conference.title), moderations_path(conference) %><br>
                 <% else %>
                   <%= translated_attribute(conference.title) %>
                 <% end %>
@@ -60,6 +60,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @conferences, theme: "decidim" %>
     </div>
   </div>
 </div>

data/app/views/decidim/conferences/admin/partners/index.html.erb

@@ -51,6 +51,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @partners, theme: "decidim" %>
     </div>
   </div>
 </div>

data/app/views/decidim/conferences/admin/registration_types/index.html.erb

@@ -60,6 +60,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @registration_types, theme: "decidim" %>
     </div>
   </div>
 </div>

data/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb

@@ -10,7 +10,7 @@
           <h3><%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.certificate_of_attendance") %></h3>
           <p><%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.certificate_of_attendance_description", user: @user.name, title: translated_attribute(@conference.title), location: @conference.location, start: l(@conference.start_date, format: :decidim_short), end: l(@conference.end_date, format: :decidim_short)  ).html_safe %></p>
         </div>
-        <hr class="reset mt-m mb-m" />
+        <hr class="reset mt-m mb-m">
         <div class="diploma__attendance">
           <strong><%= t("decidim.conferences.admin.send_conference_diploma_mailer.diploma_user.attendance_verified_by") %></strong>
           <div>

data/app/views/decidim/conferences/conference_registration_mailer/confirmation.html.erb

@@ -3,7 +3,7 @@
 <p><%= t(".details_1", registration_type: translated_attribute(@registration_type.title), price: number_to_currency((@registration_type.price || 0), locale: I18n.locale, unit: Decidim.currency_unit)) %></p>
 
 <ul>
-  <% @registration_type.conference_meetings.each do |conference_meeting| %>
+  <% @registration_type.conference_meetings.order(:start_time).each do |conference_meeting| %>
     <li><%= present(conference_meeting).title %> </li>
   <% end %>
 </ul>

data/app/views/decidim/conferences/conference_registration_mailer/pending_validation.html.erb

@@ -3,7 +3,7 @@
 <p><%= t(".details", registration_type: translated_attribute(@registration_type.title), price: number_to_currency((@registration_type.price || 0), locale: I18n.locale, unit: Decidim.currency_unit)) %></p>
 
 <ul>
-  <% @registration_type.conference_meetings.each do |conference_meeting| %>
+  <% @registration_type.conference_meetings.order(:start_time).each do |conference_meeting| %>
     <li><%= present(conference_meeting).title %> </li>
   <% end %>
 </ul>

data/app/views/decidim/conferences/conferences/_partners.html.erb

@@ -1,7 +1,7 @@
 <% if conference.partners.any? %>
   <div id="conference-partners">
     <% conference.partners.group_by(&:partner_type).each do |partner_type, partners| %>
-      <hr class="reset mt-none mb-m" />
+      <hr class="reset mt-none mb-m">
       <section class="section">
         <h1 class="section-heading"><%= t(".#{partner_type.pluralize}") %></h1>
         <div class="row small-up-2 medium-up-3 card-grid">

data/app/views/decidim/conferences/conferences/_promoted_conference.html.erb

@@ -17,7 +17,7 @@
         <div class="card__content row collapse">
           <div class="large-6 large-offset-6 columns">
             <%= link_to conference_path(promoted_conference), class: "button expanded button--sc" do %>
-              <%= t("conferences.promoted_conference.take_part", scope: "layouts.decidim") %>
+              <%= t(promoted_conference.cta_button_text_key, scope: "layouts.decidim.conferences.promoted_conference") %>
             <% end %>
           </div>
         </div>

data/app/views/decidim/conferences/conferences/show.html.erb

@@ -22,7 +22,7 @@ edit_link(
       <h4 class="section-heading"><%= t("conferences.show.introduction", scope: "decidim") %></h4>
       <%= decidim_sanitize translated_attribute(current_participatory_space.short_description) %>
     </section>
-    <hr class="reset mt-none mb-m" />
+    <hr class="reset mt-none mb-m">
     <section class="section">
       <h4 class="section-heading"><%= t("conferences.show.details", scope: "decidim") %></h4>
       <%= decidim_sanitize translated_attribute(current_participatory_space.description) %>
@@ -53,7 +53,7 @@ edit_link(
     <%= render_hook(:conference_venues) %>
 
     <% if current_participatory_space.registrations_enabled? %>
-      <hr class="reset mt-none mb-m" />
+      <hr class="reset mt-none mb-m">
       <section class="section">
         <h4 class="section-heading"><%= t(".register") %></h4>
         <% if current_user.present? %>
@@ -72,7 +72,7 @@ edit_link(
       </section>
     <% end %>
 
-    <hr class="reset mt-none mb-m" />
+    <hr class="reset mt-none mb-m">
 
     <% unless translated_attribute(current_participatory_space.objectives).blank? %>
       <section class="section">

data/app/views/decidim/conferences/media/index.html.erb

@@ -16,7 +16,7 @@ edit_link(
         <h1 class="section-heading"><%= t("media.index.title", scope: "decidim") %></h1>
         <p><%= t("media.index.description", scope: "decidim") %></p>
       </section>
-      <hr class="reset mt-none mb-s" />
+      <hr class="reset mt-none mb-s">
       <section class="media-links">
         <ul class="list-reset">
           <% @media_links.each do |media_link| %>
@@ -24,7 +24,7 @@ edit_link(
           <% end %>
         </ul>
       </section>
-      <hr class="reset mt-none mb-s" />
+      <hr class="reset mt-none mb-s">
     <% end %>
     <%= attachments_for_conference current_participatory_space %>
   </div>