decidim-conferences 0.20.0 → 0.23.1.rc1

data/config/locales/zh-TW.yml

@@ -0,0 +1 @@
+zh-TW:

data/db/migrate/20200320105913_index_foreign_keys_in_decidim_conferences.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimConferences < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_conferences, :decidim_scope_id
+  end
+end

data/db/migrate/20200320105914_index_foreign_keys_in_decidim_conferences_conference_invites.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimConferencesConferenceInvites < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_conferences_conference_invites, :decidim_conference_registration_type_id, name: "ixd_conferences_on_registration_type_id"
+  end
+end

data/db/migrate/20200320105915_index_foreign_keys_in_decidim_conferences_conference_registrations.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimConferencesConferenceRegistrations < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_conferences_conference_registrations, :decidim_conference_registration_type_id, name: "idx_conferences_registrations_on_registration_type_id"
+  end
+end

data/lib/decidim/conferences/admin_engine.rb

@@ -58,6 +58,7 @@ module Decidim
             member do
               put :publish
               put :unpublish
+              get :share
             end
             resources :exports, only: :create
           end

data/lib/decidim/conferences/participatory_space.rb

@@ -15,6 +15,8 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
     "Decidim::Conferences::ConferenceInvite"
   ]
 
+  participatory_space.query_type = "Decidim::Conferences::ConferenceType"
+
   participatory_space.register_resource(:conference) do |resource|
     resource.model_class_name = "Decidim::Conference"
     resource.card = "decidim/conferences/conference"
@@ -32,6 +34,11 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
     context.layout = "layouts/decidim/admin/conference"
   end
 
+  participatory_space.register_on_destroy_account do |user|
+    Decidim::ConferenceUserRole.where(user: user).destroy_all
+    Decidim::ConferenceSpeaker.where(user: user).destroy_all
+  end
+
   participatory_space.seeds do
     organization = Decidim::Organization.first
     seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
@@ -39,7 +46,7 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
     Decidim::ContentBlock.create(
       organization: organization,
       weight: 33,
-      scope: :homepage,
+      scope_name: :homepage,
       manifest_name: :highlighted_conferences,
       published_at: Time.current
     )
@@ -56,11 +63,11 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
         end,
-        hero_image: File.new(File.join(seeds_root, "city.jpeg")),
-        banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+        organization: organization,
+        hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
+        banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
         promoted: true,
         published_at: 2.weeks.ago,
-        organization: organization,
         objectives: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
         end,
@@ -106,23 +113,23 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(2),
         description: Decidim::Faker::Localized.sentence(5),
-        file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
         attachment_collection: attachment_collection,
-        attached_to: conference
+        attached_to: conference,
+        file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
       )
 
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(2),
         description: Decidim::Faker::Localized.sentence(5),
-        file: File.new(File.join(seeds_root, "city.jpeg")),
-        attached_to: conference
+        attached_to: conference,
+        file: File.new(File.join(seeds_root, "city.jpeg")) # Keep after attached_to
       )
 
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(2),
         description: Decidim::Faker::Localized.sentence(5),
-        file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
-        attached_to: conference
+        attached_to: conference,
+        file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
       )
 
       2.times do
@@ -157,8 +164,8 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
             weight: Faker::Number.between(1, 10),
             link: Faker::Internet.url,
             partner_type: type,
-            logo: File.new(File.join(seeds_root, "logo.png")),
-            conference: conference
+            conference: conference,
+            logo: File.new(File.join(seeds_root, "logo.png")) # Keep after conference
           )
         end
       end

data/lib/decidim/conferences/test/factories.rb

@@ -15,14 +15,15 @@ FactoryBot.define do
     short_description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     objectives { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
-    banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
+    organization
+    hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after organization
+    banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
     published_at { Time.current }
     location { Faker::Lorem.sentence(3) }
-    organization
     show_statistics { true }
     start_date { 1.month.ago }
     end_date { 1.month.ago + 3.days }
+    registration_terms { generate_localized_title }
 
     trait :promoted do
       promoted { true }
@@ -95,6 +96,21 @@ FactoryBot.define do
     end
   end
 
+  factory :conference_valuator, parent: :user, class: "Decidim::User" do
+    transient do
+      conference { create(:conference) }
+    end
+
+    organization { conference.organization }
+
+    after(:create) do |user, evaluator|
+      create :conference_user_role,
+             user: user,
+             conference: evaluator.conference,
+             role: :valuator
+    end
+  end
+
   factory :conference_speaker, class: "Decidim::ConferenceSpeaker" do
     conference { create(:conference) }
 

data/lib/decidim/conferences/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-conferences
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.23.1.rc1
 platform: ruby
 authors:
 - Isaac Massot Gil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-11-06 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.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 description: Conferences component for decidim.
 email:
 - isaac.mg@coditramuntana.com
@@ -150,6 +150,7 @@ files:
 - app/commands/decidim/conferences/admin/destroy_registration_type.rb
 - app/commands/decidim/conferences/admin/export_conference_registrations.rb
 - app/commands/decidim/conferences/admin/invite_user_to_join_conference.rb
+- app/commands/decidim/conferences/admin/notify_role_assigned_to_conference.rb
 - app/commands/decidim/conferences/admin/publish_conference.rb
 - app/commands/decidim/conferences/admin/publish_registration_type.rb
 - app/commands/decidim/conferences/admin/send_conference_diplomas.rb
@@ -168,6 +169,7 @@ files:
 - app/constraints/decidim/conferences/current_component.rb
 - app/constraints/decidim/conferences/current_conference.rb
 - app/controllers/concerns/decidim/conferences/admin/conference_context.rb
+- app/controllers/concerns/decidim/conferences/admin/filterable.rb
 - app/controllers/decidim/conferences/admin/application_controller.rb
 - app/controllers/decidim/conferences/admin/categories_controller.rb
 - app/controllers/decidim/conferences/admin/component_permissions_controller.rb
@@ -200,6 +202,7 @@ files:
 - app/events/decidim/conferences/conference_registration_notification_event.rb
 - app/events/decidim/conferences/conference_registrations_enabled_event.rb
 - app/events/decidim/conferences/conference_registrations_over_percentage_event.rb
+- app/events/decidim/conferences/conference_role_assigned_event.rb
 - app/events/decidim/conferences/upcoming_conference_event.rb
 - app/events/decidim/conferences/update_conference_event.rb
 - app/forms/decidim/conferences/admin/conference_copy_form.rb
@@ -265,6 +268,10 @@ files:
 - app/serializers/decidim/conferences/conference_registration_serializer.rb
 - app/serializers/decidim/conferences/data_portability_conference_invite_serializer.rb
 - app/serializers/decidim/conferences/data_portability_conference_registration_serializer.rb
+- app/types/decidim/conferences/conference_media_link_type.rb
+- app/types/decidim/conferences/conference_partner_type.rb
+- app/types/decidim/conferences/conference_speaker_type.rb
+- app/types/decidim/conferences/conference_type.rb
 - app/uploaders/decidim/conferences/diploma_uploader.rb
 - app/uploaders/decidim/conferences/partner_logo_uploader.rb
 - app/views/decidim/conference_speakers/_conference_speaker.html.erb
@@ -311,7 +318,6 @@ files:
 - app/views/decidim/conferences/conference_registration_mailer/confirmation.html.erb
 - app/views/decidim/conferences/conference_registration_mailer/pending_validation.html.erb
 - app/views/decidim/conferences/conference_speakers/index.html.erb
-- app/views/decidim/conferences/conference_widgets/show.html.erb
 - app/views/decidim/conferences/conferences/_partners.html.erb
 - app/views/decidim/conferences/conferences/_promoted_conference.html.erb
 - app/views/decidim/conferences/conferences/_statistics.html.erb
@@ -330,35 +336,72 @@ files:
 - app/views/layouts/decidim/conference.html.erb
 - app/views/layouts/decidim/diploma.html.erb
 - config/initializers/wicked_pdf.rb
+- config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
+- config/locales/bg.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
+- config/locales/da.yml
 - config/locales/de.yml
+- config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
+- config/locales/eo.yml
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
+- config/locales/et.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
+- config/locales/fr-CA.yml
 - config/locales/fr.yml
+- config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/hr-HR.yml
+- config/locales/hr.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
+- config/locales/is-IS.yml
+- config/locales/is.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/ja.yml
+- config/locales/ko-KR.yml
+- config/locales/ko.yml
+- config/locales/lt-LT.yml
+- config/locales/lt.yml
+- config/locales/lv.yml
+- config/locales/mt-MT.yml
+- config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
+- config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
+- config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/sk-SK.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/so-SO.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
+- config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
+- config/locales/vi-VN.yml
+- config/locales/vi.yml
+- config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - db/migrate/20180626151505_add_conferences.rb
 - db/migrate/20180626152015_add_conference_user_roles.rb
 - db/migrate/20180702084256_add_conference_speakers.rb
@@ -372,6 +415,9 @@ files:
 - db/migrate/20181030153614_add_registration_type_to_conference_invite.rb
 - db/migrate/20181106092826_add_diploma_fields_to_conference.rb
 - db/migrate/20181123124424_make_price_optional_conference_registration_type.rb
+- db/migrate/20200320105913_index_foreign_keys_in_decidim_conferences.rb
+- db/migrate/20200320105914_index_foreign_keys_in_decidim_conferences_conference_invites.rb
+- db/migrate/20200320105915_index_foreign_keys_in_decidim_conferences_conference_registrations.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -396,12 +442,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 

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

@@ -1,11 +0,0 @@
-<% content_for(:header, "false") %>
-<% content_for(:title, translated_attribute(model.title)) %>
-<p class="card__desc"><%= decidim_sanitize html_truncate(translated_attribute(model.short_description), length: 630, separator: "...") %></p>
-<% content_for(:footer) do %>
-  <div class="card__support">
-    <span class="card--process__small"></span>
-    <%= link_to conference_path(model), class: "card__button button small" do %>
-      <%= t("conference_widgets.show.take_part", scope: "layouts.decidim") %>
-    <% end %>
-  </div>
-<% end %>