decidim-conferences 0.26.2 → 0.27.0.rc2

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

@@ -17,7 +17,7 @@ module Decidim
         attribute :full_name, String
         attribute :twitter_handle, String
         attribute :personal_url, String
-        attribute :avatar
+        attribute :avatar, Decidim::Attributes::Blob
         attribute :remove_avatar, Boolean, default: false
         attribute :user_id, Integer
         attribute :existing_user, Boolean, default: false

data/app/mailers/decidim/conferences/admin/send_conference_diploma_mailer.rb

@@ -35,8 +35,8 @@ module Decidim
         def add_diploma_attachment
           diploma = WickedPdf.new.pdf_from_string(
             render_to_string(pdf: "conference-diploma",
-                             template: "decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb",
-                             layout: "decidim/diploma.html.erb"),
+                             template: "decidim/conferences/admin/send_conference_diploma_mailer/diploma_user",
+                             layout: "decidim/diploma"),
             orientation: "Landscape"
           )
 

data/app/models/decidim/conference.rb

@@ -19,6 +19,7 @@ module Decidim
     include Decidim::Searchable
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
+    include Decidim::FilterableResource
 
     translatable_fields :title, :slogan, :short_description, :description, :objectives, :registration_terms
 
@@ -140,8 +141,6 @@ module Decidim
     end
 
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-    ransacker :title do |parent|
-      Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
-    end
+    ransacker_i18n :title
   end
 end

data/app/models/decidim/conferences/conference_invite.rb

@@ -6,7 +6,7 @@ module Decidim
     class ConferenceInvite < ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
       belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -15,7 +15,7 @@ module Decidim
       validates :user, uniqueness: { scope: :conference }
 
       def self.export_serializer
-        Decidim::Conferences::DataPortabilityConferenceInviteSerializer
+        Decidim::Conferences::DownloadYourDataConferenceInviteSerializer
       end
 
       def self.log_presenter_class_for(_log)

data/app/models/decidim/conferences/conference_registration.rb

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     # The data store for a Registration in the Decidim::Conferences component.
     class ConferenceRegistration < ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
       belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -19,7 +19,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::Conferences::DataPortabilityConferenceRegistrationSerializer
+        Decidim::Conferences::DownloadYourDataConferenceRegistrationSerializer
       end
 
       def confirmed?

data/app/presenters/decidim/conference_speaker_presenter.rb

@@ -46,11 +46,9 @@ module Decidim
     private
 
     def user
-      @user ||= begin
-        if (user = __getobj__.user.presence)
-          Decidim::UserPresenter.new(user)
-        end
-      end
+      @user ||= if (user = __getobj__.user.presence)
+                  Decidim::UserPresenter.new(user)
+                end
     end
   end
 end

data/app/presenters/decidim/conferences/conference_stats_presenter.rb

@@ -4,9 +4,12 @@ module Decidim
   module Conferences
     # A presenter to render statistics in the homepage.
     class ConferenceStatsPresenter < Decidim::StatsPresenter
-      attribute :conference, Decidim::Conference
       include IconHelper
 
+      def conference
+        __getobj__.fetch(:conference)
+      end
+
       # Public: Render a collection of primary stats.
       def highlighted
         highlighted_stats = component_stats(priority: StatsRegistry::HIGH_PRIORITY)

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

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # A class used to find the admins for an conference or an organization conferences.
-      class AdminUsers < Rectify::Query
+      class AdminUsers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # conference - an conference that needs to find its conference admins

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

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # A class used to find the ConferenceInvites by their status status.
-      class ConferenceInvites < Rectify::Query
+      class ConferenceInvites < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # conference_invites - the initial Invites relation that needs to be filtered.

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

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # A class used to find the ConferenceSpeakers's by the search.
-      class ConferenceSpeakers < Rectify::Query
+      class ConferenceSpeakers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # conference_speakers - the initial ConferenceSpeaker relation that needs to be filtered.

data/app/queries/decidim/conferences/conference_program_meetings.rb

@@ -3,14 +3,14 @@
 module Decidim
   module Conferences
     # This query class filters meetings for component and day
-    class ConferenceProgramMeetings < Rectify::Query
+    class ConferenceProgramMeetings < Decidim::Query
       def initialize(component, user = nil)
         @component = component
         @user = user
       end
 
       def query
-        Decidim::Meetings::Meeting.where(component: @component).visible_meeting_for(@user)
+        Decidim::Meetings::Meeting.where(component: @component).visible_for(@user)
       end
     end
   end

data/app/queries/decidim/conferences/conference_program_meetings_by_day.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This query class filters meetings for component and day
-    class ConferenceProgramMeetingsByDay < Rectify::Query
+    class ConferenceProgramMeetingsByDay < Decidim::Query
       def initialize(component, day, user = nil)
         @component = component
         @day = day
@@ -11,9 +11,9 @@ module Decidim
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           ConferenceProgramMeetings.new(@component, @user)
-        ).query.where(start_time: @day.beginning_of_day..@day.end_of_day).order(start_time: :asc)
+        ).query.where(start_time: @day.all_day).order(start_time: :asc)
       end
     end
   end

data/app/queries/decidim/conferences/conferences_with_user_role.rb

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     # A class used to find the Conferences that the given user has
     # the specific role privilege.
-    class ConferencesWithUserRole < Rectify::Query
+    class ConferencesWithUserRole < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # user - a User that needs to find which conferences can manage

data/app/queries/decidim/conferences/organization_conferences.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This query class filters all conferences given an organization.
-    class OrganizationConferences < Rectify::Query
+    class OrganizationConferences < Decidim::Query
       def initialize(organization)
         @organization = organization
       end

data/app/queries/decidim/conferences/organization_prioritized_conferences.rb

@@ -4,17 +4,17 @@ module Decidim
   module Conferences
     # This query class filters public conferences given an organization in a
     # meaningful prioritized order.
-    class OrganizationPrioritizedConferences < Rectify::Query
+    class OrganizationPrioritizedConferences < Decidim::Query
       def initialize(organization, user = nil)
         @organization = organization
         @user = user
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationPublishedConferences.new(@organization, @user),
           PrioritizedConferences.new
-        ).query
+        ).query.with_attached_hero_image
       end
     end
   end

data/app/queries/decidim/conferences/organization_published_conferences.rb

@@ -3,18 +3,18 @@
 module Decidim
   module Conferences
     # This query class filters published conferences given an organization.
-    class OrganizationPublishedConferences < Rectify::Query
+    class OrganizationPublishedConferences < Decidim::Query
       def initialize(organization, user = nil)
         @organization = organization
         @user = user
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationConferences.new(@organization),
           VisibleConferences.new(@user),
           PublishedConferences.new
-        ).query
+        ).query.order(start_date: :desc)
       end
     end
   end

data/app/queries/decidim/conferences/prioritized_conferences.rb

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     # This query orders conferences by importance, prioritizing promoted
     # conferences.
-    class PrioritizedConferences < Rectify::Query
+    class PrioritizedConferences < Decidim::Query
       def query
         Decidim::Conference.order(promoted: :desc)
       end

data/app/queries/decidim/conferences/promoted_conferences.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This query filters conferences so only promoted ones are returned.
-    class PromotedConferences < Rectify::Query
+    class PromotedConferences < Decidim::Query
       def query
         Decidim::Conference.promoted
       end

data/app/queries/decidim/conferences/published_conferences.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This query filters published conferences only.
-    class PublishedConferences < Rectify::Query
+    class PublishedConferences < Decidim::Query
       def query
         Decidim::Conference.published
       end

data/app/queries/decidim/conferences/visible_conferences.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This query class filters conferences given a current_user.
-    class VisibleConferences < Rectify::Query
+    class VisibleConferences < Decidim::Query
       def query
         Decidim::Conference.public_spaces
       end

data/app/serializers/decidim/conferences/{data_portability_conference_invite_serializer.rb → download_your_data_conference_invite_serializer.rb}

@@ -2,8 +2,8 @@
 
 module Decidim
   module Conferences
-    class DataPortabilityConferenceInviteSerializer < Decidim::Exporters::Serializer
-      # Serializes a conference invite for data portability
+    class DownloadYourDataConferenceInviteSerializer < Decidim::Exporters::Serializer
+      # Serializes a conference invite for download your data
       def serialize
         {
           id: resource.id,

data/app/serializers/decidim/conferences/{data_portability_conference_registration_serializer.rb → download_your_data_conference_registration_serializer.rb}

@@ -2,8 +2,8 @@
 
 module Decidim
   module Conferences
-    class DataPortabilityConferenceRegistrationSerializer < Decidim::Exporters::Serializer
-      # Serializes a registration for data portability
+    class DownloadYourDataConferenceRegistrationSerializer < Decidim::Exporters::Serializer
+      # Serializes a registration for download your data
       def serialize
         {
           id: resource.id,

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

@@ -36,7 +36,9 @@
                 <% end %>
               </td>
               <td>
-                <%= image_tag(partner.attached_uploader(:logo).path(variant: :thumb)) %>
+                <% if partner.attached_uploader(:logo).path %>
+                  <%= image_tag(partner.attached_uploader(:logo).path(variant: :thumb)) %>
+                <% end %>
               </td>
               <td class="table-list__actions">
                 <% if allowed_to? :update, :partner, partner: partner %>

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

@@ -13,7 +13,7 @@
     </div>
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card--full__image"
-           style="background-image:url(<%= promoted_conference.attached_uploader(:hero_image).path %>)">
+           style="background-image:url('<%= promoted_conference.attached_uploader(:hero_image).path %>')">
         <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 %>

data/app/views/layouts/decidim/_conference_hero.html.erb

@@ -1,5 +1,5 @@
 <section class="extended hero"
-  style="background-image:url(<%= current_participatory_space.attached_uploader(:banner_image).path %>);">
+  style="background-image:url('<%= current_participatory_space.attached_uploader(:banner_image).path %>');">
   <div class="hero__container">
     <div class="row">
       <div class="columns large-10 text-left">

data/app/views/layouts/decidim/_conferences_nav.html.erb

@@ -16,7 +16,7 @@
       active: is_active_link?(decidim_conferences.conference_conference_speakers_path(current_participatory_space), :inclusive)
     } : nil
   ] + meeting_components.map do |component|
-    Decidim::Meetings::Meeting.visible_meeting_for(current_user).any? ? {
+    Decidim::Meetings::Meeting.visible_for(current_user).any? ? {
       name: translated_attribute(component.name),
       url: decidim_conferences.conference_conference_program_path(current_participatory_space, id: component.id),
       active: is_active_link?(decidim_conferences.conference_conference_program_path(current_participatory_space, id: component.id), :inclusive)

data/config/locales/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:

data/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:

data/config/locales/cs.yml

@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:

data/config/locales/de.yml

@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:

data/config/locales/el.yml

@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:

data/config/locales/en.yml

@@ -352,7 +352,7 @@ en:
             invites: Invites
             search: Search
           new:
-            explanation: The participant will be invited to join a conference. If her email is not registered she will be invited to the organization as well.
+            explanation: The participant will be invited to join a conference. If their email is not registered, they'll be invited to the organization as well.
             invite: Invite
             new_invite: Invite participant
         conference_registrations:

data/config/locales/es-MX.yml

@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:

data/config/locales/es-PY.yml

@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:

data/config/locales/es.yml

@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -351,7 +352,7 @@ es:
             invites: Invita
             search: Buscar
           new:
-            explanation: La participante será invitada a unirse a una jornada. Si su correo electrónico no está registrado, también será invitada a unirse a la organización.
+            explanation: La participante será invitada a unirse a la jornada. Si su correo electrónico no está registrado, también será invitada a unirse a la organización.
             invite: Invitar
             new_invite: Invitar participante
         conference_registrations:

data/config/locales/eu.yml

@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:

data/config/locales/fi-plain.yml

@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:

data/config/locales/fi.yml

@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -351,7 +352,7 @@ fi:
             invites: Kutsut
             search: Hae
           new:
-            explanation: Käyttäjä kutsutaan mukaan konferenssiin. Jos sähköposti ei ole rekisteröity, käyttäjä kutsutaan myös organisaatioon.
+            explanation: Käyttäjä kutsutaan mukaan konferenssiin. Jos sähköpostiosoitteella ei ole käyttäjätiliä, käyttäjä kutsutaan myös organisaatioon.
             invite: Kutsu
             new_invite: Kutsu käyttäjä
         conference_registrations:

data/config/locales/fr-CA.yml

@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:

data/config/locales/fr.yml

@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -23,7 +24,7 @@ fr:
         registration_terms: Conditions d’inscription
         registrations_enabled: Inscriptions ouvertes
         scope_id: Périmètre
-        scopes_enabled: Périmètres d'application activés
+        scopes_enabled: Secteurs activés
         short_description: Brève description
         show_statistics: Montrer les statistiques
         sign_date: Date de signature
@@ -351,7 +352,7 @@ fr:
             invites: Invite
             search: Chercher
           new:
-            explanation: L'utilisateur sera invité à participer à une conférence. Si l'e-mail n'est pas enregistré, ils seront également invités à l'organisation.
+            explanation: L'utilisateur sera invité à participer à une conférence. Si l'e-mail n'est pas enregistré, ils seront également invités dans l'organisation.
             invite: Inviter
             new_invite: Inviter un utilisateur
         conference_registrations:

data/config/locales/ga-IE.yml

@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:

data/config/locales/gl.yml

@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:

data/config/locales/hu.yml

@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:

data/config/locales/id-ID.yml

@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:

data/config/locales/it.yml

@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:

data/config/locales/ja.yml

@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:

data/config/locales/lb.yml

@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes: