decidim-conferences 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17b13f7756447bf49686845ee1c035fd843c7187110f1e2fe0c3938d8b42d5eb
-  data.tar.gz: 0b7c31d1b7feeefb0e7eb727269002479e7bdb57eadf61a0c7bd2cc1c95a5664
+  metadata.gz: 5fe396d63f9e335c79c6ef5d3c2e7220226e03e6797e184cb60a681b30c79d6b
+  data.tar.gz: 8ee8b6a31e1f5f2cccc59de336da8f8f62f4943c8144d9571243727dbeff4300
 SHA512:
-  metadata.gz: 42f0d7c52d5f2eb0c555d145505372412fd5e763cc4bc546c7a356bd6bdf774d601f3a620965bed1f068eaa6a1df5986b930cb2771538d6646a2a489d0bde293
-  data.tar.gz: 8af57513c692428d9c7a9685441bd13470e271b15d4dd0960b5a2c8a0fad6ea4c790434c9f2b7557d9961db5efabe47b6ccf92679c0b0903a021db39147424f6
+  metadata.gz: dee2e08fa8880ee4c54af3b7da1291adde063e006377b0472481cc515396eb632f8bb78667e714ce0062a99c74a1d7f0d9a7afaac8ce62a129588ce8af4287cd
+  data.tar.gz: 6dbb9a34018713b7d5d19891a03f5a7e5cd32dc2f1deb219828ec1c502e14197be5499b9c61947f707008d09f8be70554c5de207fc6361c48ab0c3edcdf70a5a

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

@@ -9,13 +9,14 @@ module Decidim
       #
       class ConferenceRegistrationsController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
+        include Decidim::Paginable
 
         helper_method :conference
 
         def index
           enforce_permission_to :read_conference_registrations, :conference, conference: conference
 
-          @conference_registrations = Decidim::Conferences::ConferenceRegistration.where(conference: conference).page(params[:page]).per(15)
+          @conference_registrations = paginate(Decidim::Conferences::ConferenceRegistration.where(conference: conference))
         end
 
         def export

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

@@ -8,13 +8,14 @@ module Decidim
       class ConferenceSpeakersController < Decidim::Conferences::Admin::ApplicationController
         helper Decidim::Conferences::Admin::ConferenceSpeakersHelper
         include Concerns::ConferenceAdmin
+        include Decidim::Paginable
 
         def index
           enforce_permission_to :index, :conference_speaker
 
           @query = params[:q]
 
-          @conference_speakers = Decidim::Conferences::Admin::ConferenceSpeakers.for(collection, @query).page(params[:page]).per(15)
+          @conference_speakers = paginate(Decidim::Conferences::Admin::ConferenceSpeakers.for(collection, @query))
         end
 
         def new

data/app/controllers/decidim/conferences/admin/conference_user_roles_controller.rb

@@ -7,10 +7,11 @@ module Decidim
       #
       class ConferenceUserRolesController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
+        include Decidim::Paginable
 
         def index
           enforce_permission_to :index, :conference_user_role
-          @conference_user_roles = collection
+          @conference_user_roles = paginate(collection)
         end
 
         def new

data/app/controllers/decidim/conferences/admin/conferences_controller.rb

@@ -8,10 +8,11 @@ module Decidim
       class ConferencesController < Decidim::Conferences::Admin::ApplicationController
         helper_method :current_conference, :current_participatory_space
         layout "decidim/admin/conferences"
+        include Decidim::Paginable
 
         def index
           enforce_permission_to :read, :conference_list
-          @conferences = collection
+          @conferences = paginate(collection)
         end
 
         def new

data/app/controllers/decidim/conferences/admin/media_links_controller.rb

@@ -6,11 +6,12 @@ module Decidim
       # Controller that allows managing conference media links.
       class MediaLinksController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
+        include Decidim::Paginable
 
         def index
           enforce_permission_to :index, :media_link
 
-          @media_links = collection.page(params[:page]).per(15)
+          @media_links = paginate(collection)
         end
 
         def new

data/app/controllers/decidim/conferences/admin/partners_controller.rb

@@ -7,11 +7,12 @@ module Decidim
       #
       class PartnersController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
+        include Decidim::Paginable
 
         def index
           enforce_permission_to :index, :partner
 
-          @partners = collection.page(params[:page]).per(15)
+          @partners = paginate(collection)
         end
 
         def new

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

@@ -8,11 +8,12 @@ module Decidim
       class RegistrationTypesController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
         include Decidim::ApplicationHelper
+        include Decidim::Paginable
 
         def index
           enforce_permission_to :index, :registration_type
 
-          @registration_types = collection.page(params[:page]).per(15)
+          @registration_types = paginate(collection)
         end
 
         def new

data/app/models/decidim/conference.rb

@@ -16,6 +16,7 @@ module Decidim
     include Decidim::Traceable
     include Decidim::Loggable
     include Decidim::ParticipatorySpaceResourceable
+    include Decidim::Searchable
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -55,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.

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

@@ -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

@@ -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/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/lib/decidim/conferences/participatory_space.rb

@@ -18,6 +18,7 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
   participatory_space.register_resource(:conference) do |resource|
     resource.model_class_name = "Decidim::Conference"
     resource.card = "decidim/conferences/conference"
+    resource.searchable = true
   end
 
   participatory_space.context(:public) do |context|
@@ -71,6 +72,7 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
           Decidim::Faker::Localized.paragraph(3)
         end
       )
+      conference.add_to_index_as_search_resource
 
       # Create users with specific roles
       Decidim::ConferenceUserRole::ROLES.each do |role|

data/lib/decidim/conferences/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-conferences version.
   module Conferences
     def self.version
-      "0.19.1"
+      "0.20.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-conferences
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Isaac Massot Gil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 description: Conferences component for decidim.
 email:
 - isaac.mg@coditramuntana.com