decidim-conferences 0.18.1 → 0.21.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (79) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -0
  3. data/app/assets/stylesheet/decidim/conferences/conferences.scss +3 -0
  4. data/app/cells/decidim/conferences/conference_address/show.erb +1 -1
  5. data/app/cells/decidim/conferences/conference_speaker/show.erb +2 -2
  6. data/app/cells/decidim/conferences/conference_speaker_cell.rb +6 -2
  7. data/app/cells/decidim/conferences/linked_participatory_spaces_cell.rb +6 -0
  8. data/app/cells/decidim/conferences/partner_cell.rb +2 -0
  9. data/app/cells/decidim/conferences/photos_list_cell.rb +1 -0
  10. data/app/cells/decidim/conferences/registration_type_cell.rb +2 -0
  11. data/app/commands/decidim/conferences/admin/confirm_conference_registration.rb +1 -0
  12. data/app/commands/decidim/conferences/admin/create_conference.rb +3 -13
  13. data/app/commands/decidim/conferences/admin/create_conference_admin.rb +1 -0
  14. data/app/commands/decidim/conferences/admin/publish_conference.rb +12 -0
  15. data/app/commands/decidim/conferences/admin/update_conference.rb +9 -5
  16. data/app/commands/decidim/conferences/admin/update_diploma.rb +1 -0
  17. data/app/commands/decidim/conferences/join_conference.rb +2 -0
  18. data/app/commands/decidim/conferences/leave_conference.rb +1 -0
  19. data/app/controllers/concerns/decidim/conferences/admin/filterable.rb +27 -0
  20. data/app/controllers/decidim/conferences/admin/conference_registrations_controller.rb +3 -1
  21. data/app/controllers/decidim/conferences/admin/conference_speakers_controller.rb +2 -1
  22. data/app/controllers/decidim/conferences/admin/conference_user_roles_controller.rb +2 -1
  23. data/app/controllers/decidim/conferences/admin/conferences_controller.rb +4 -4
  24. data/app/controllers/decidim/conferences/admin/media_links_controller.rb +2 -1
  25. data/app/controllers/decidim/conferences/admin/partners_controller.rb +2 -1
  26. data/app/controllers/decidim/conferences/admin/registration_types_controller.rb +2 -1
  27. data/app/controllers/decidim/conferences/conference_program_controller.rb +4 -1
  28. data/app/controllers/decidim/conferences/conference_registrations_controller.rb +1 -0
  29. data/app/controllers/decidim/conferences/conference_speakers_controller.rb +1 -0
  30. data/app/controllers/decidim/conferences/media_controller.rb +1 -0
  31. data/app/controllers/decidim/conferences/registration_types_controller.rb +1 -0
  32. data/app/forms/decidim/conferences/admin/conference_form.rb +4 -0
  33. data/app/forms/decidim/conferences/admin/conference_speaker_form.rb +1 -0
  34. data/app/forms/decidim/conferences/admin/registration_type_form.rb +1 -0
  35. data/app/helpers/decidim/conferences/conference_helper.rb +1 -0
  36. data/app/models/decidim/conference.rb +29 -4
  37. data/app/models/decidim/conference_user_role.rb +2 -1
  38. data/app/permissions/decidim/conferences/permissions.rb +15 -0
  39. data/app/presenters/decidim/conferences/admin_log/value_types/role_presenter.rb +1 -0
  40. data/app/presenters/decidim/log/value_types/conference_presenter.rb +1 -0
  41. data/app/queries/decidim/conferences/admin/conference_invites.rb +1 -0
  42. data/app/queries/decidim/conferences/admin/conference_speakers.rb +1 -0
  43. data/app/types/decidim/conferences/conference_media_link_type.rb +19 -0
  44. data/app/types/decidim/conferences/conference_partner_type.rb +20 -0
  45. data/app/types/decidim/conferences/conference_speaker_type.rb +24 -0
  46. data/app/types/decidim/conferences/conference_type.rb +45 -0
  47. data/app/views/decidim/conferences/admin/conference_speakers/index.html.erb +1 -0
  48. data/app/views/decidim/conferences/admin/conference_user_roles/index.html.erb +4 -3
  49. data/app/views/decidim/conferences/admin/conferences/index.html.erb +9 -5
  50. data/app/views/decidim/conferences/admin/partners/index.html.erb +1 -0
  51. data/app/views/decidim/conferences/admin/registration_types/index.html.erb +1 -0
  52. data/app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb +1 -1
  53. data/app/views/decidim/conferences/conference_registration_mailer/confirmation.html.erb +1 -1
  54. data/app/views/decidim/conferences/conference_registration_mailer/pending_validation.html.erb +1 -1
  55. data/app/views/decidim/conferences/conferences/_partners.html.erb +1 -1
  56. data/app/views/decidim/conferences/conferences/show.html.erb +3 -3
  57. data/app/views/decidim/conferences/media/index.html.erb +2 -2
  58. data/app/views/layouts/decidim/_conference_hero.html.erb +2 -2
  59. data/app/views/layouts/decidim/admin/conference.html.erb +2 -2
  60. data/app/views/layouts/decidim/diploma.html.erb +2 -2
  61. data/config/locales/ar.yml +4 -2
  62. data/config/locales/ca.yml +1 -0
  63. data/config/locales/cs.yml +2 -1
  64. data/config/locales/el-GR.yml +1 -0
  65. data/config/locales/el.yml +1 -0
  66. data/config/locales/en.yml +1 -0
  67. data/config/locales/es-MX.yml +1 -0
  68. data/config/locales/es-PY.yml +1 -0
  69. data/config/locales/es.yml +1 -0
  70. data/config/locales/fi-plain.yml +1 -0
  71. data/config/locales/fi.yml +1 -0
  72. data/config/locales/hu.yml +2 -1
  73. data/config/locales/is-IS.yml +1 -0
  74. data/config/locales/no.yml +566 -0
  75. data/lib/decidim/conferences/participatory_space.rb +5 -0
  76. data/lib/decidim/conferences/test/factories.rb +16 -0
  77. data/lib/decidim/conferences/version.rb +1 -1
  78. metadata +28 -20
  79. data/app/views/decidim/conferences/conference_widgets/show.html.erb +0 -11
@@ -3,6 +3,7 @@
3
3
  Decidim.register_participatory_space(:conferences) do |participatory_space|
4
4
  participatory_space.icon = "decidim/conferences/conference.svg"
5
5
  participatory_space.model_class_name = "Decidim::Conference"
6
+ participatory_space.stylesheet = "decidim/conferences/conferences"
6
7
 
7
8
  participatory_space.participatory_spaces do |organization|
8
9
  Decidim::Conferences::OrganizationConferences.new(organization).query
@@ -14,9 +15,12 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
14
15
  "Decidim::Conferences::ConferenceInvite"
15
16
  ]
16
17
 
18
+ participatory_space.query_type = "Decidim::Conferences::ConferenceType"
19
+
17
20
  participatory_space.register_resource(:conference) do |resource|
18
21
  resource.model_class_name = "Decidim::Conference"
19
22
  resource.card = "decidim/conferences/conference"
23
+ resource.searchable = true
20
24
  end
21
25
 
22
26
  participatory_space.context(:public) do |context|
@@ -70,6 +74,7 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
70
74
  Decidim::Faker::Localized.paragraph(3)
71
75
  end
72
76
  )
77
+ conference.add_to_index_as_search_resource
73
78
 
74
79
  # Create users with specific roles
75
80
  Decidim::ConferenceUserRole::ROLES.each do |role|
@@ -23,6 +23,7 @@ FactoryBot.define do
23
23
  show_statistics { true }
24
24
  start_date { 1.month.ago }
25
25
  end_date { 1.month.ago + 3.days }
26
+ registration_terms { generate_localized_title }
26
27
 
27
28
  trait :promoted do
28
29
  promoted { true }
@@ -95,6 +96,21 @@ FactoryBot.define do
95
96
  end
96
97
  end
97
98
 
99
+ factory :conference_valuator, parent: :user, class: "Decidim::User" do
100
+ transient do
101
+ conference { create(:conference) }
102
+ end
103
+
104
+ organization { conference.organization }
105
+
106
+ after(:create) do |user, evaluator|
107
+ create :conference_user_role,
108
+ user: user,
109
+ conference: evaluator.conference,
110
+ role: :valuator
111
+ end
112
+ end
113
+
98
114
  factory :conference_speaker, class: "Decidim::ConferenceSpeaker" do
99
115
  conference { create(:conference) }
100
116
 
@@ -4,7 +4,7 @@ module Decidim
4
4
  # This holds the decidim-conferences version.
5
5
  module Conferences
6
6
  def self.version
7
- "0.18.1"
7
+ "0.21.0"
8
8
  end
9
9
  end
10
10
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-conferences
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.18.1
4
+ version: 0.21.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Isaac Massot Gil
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-10-21 00:00:00.000000000 Z
11
+ date: 2020-04-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: decidim-core
@@ -16,84 +16,84 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.18.1
19
+ version: 0.21.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.18.1
26
+ version: 0.21.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: decidim-meetings
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 0.18.1
33
+ version: 0.21.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 0.18.1
40
+ version: 0.21.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: wicked_pdf
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '0'
47
+ version: '1.4'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '0'
54
+ version: '1.4'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: wkhtmltopdf-binary
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '0'
61
+ version: '0.12'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '0'
68
+ version: '0.12'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: decidim-admin
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - '='
74
74
  - !ruby/object:Gem::Version
75
- version: 0.18.1
75
+ version: 0.21.0
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - '='
81
81
  - !ruby/object:Gem::Version
82
- version: 0.18.1
82
+ version: 0.21.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: decidim-dev
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - '='
88
88
  - !ruby/object:Gem::Version
89
- version: 0.18.1
89
+ version: 0.21.0
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - '='
95
95
  - !ruby/object:Gem::Version
96
- version: 0.18.1
96
+ version: 0.21.0
97
97
  description: Conferences component for decidim.
98
98
  email:
99
99
  - isaac.mg@coditramuntana.com
@@ -110,6 +110,7 @@ files:
110
110
  - app/assets/javascripts/decidim/conferences/admin/conference_speakers.js.es6
111
111
  - app/assets/javascripts/decidim/conferences/admin/conferences.js.es6
112
112
  - app/assets/javascripts/decidim/conferences/conferences.js.es6
113
+ - app/assets/stylesheet/decidim/conferences/conferences.scss
113
114
  - app/cells/decidim/conferences/conference_address/show.erb
114
115
  - app/cells/decidim/conferences/conference_address_cell.rb
115
116
  - app/cells/decidim/conferences/conference_cell.rb
@@ -167,6 +168,7 @@ files:
167
168
  - app/constraints/decidim/conferences/current_component.rb
168
169
  - app/constraints/decidim/conferences/current_conference.rb
169
170
  - app/controllers/concerns/decidim/conferences/admin/conference_context.rb
171
+ - app/controllers/concerns/decidim/conferences/admin/filterable.rb
170
172
  - app/controllers/decidim/conferences/admin/application_controller.rb
171
173
  - app/controllers/decidim/conferences/admin/categories_controller.rb
172
174
  - app/controllers/decidim/conferences/admin/component_permissions_controller.rb
@@ -264,6 +266,10 @@ files:
264
266
  - app/serializers/decidim/conferences/conference_registration_serializer.rb
265
267
  - app/serializers/decidim/conferences/data_portability_conference_invite_serializer.rb
266
268
  - app/serializers/decidim/conferences/data_portability_conference_registration_serializer.rb
269
+ - app/types/decidim/conferences/conference_media_link_type.rb
270
+ - app/types/decidim/conferences/conference_partner_type.rb
271
+ - app/types/decidim/conferences/conference_speaker_type.rb
272
+ - app/types/decidim/conferences/conference_type.rb
267
273
  - app/uploaders/decidim/conferences/diploma_uploader.rb
268
274
  - app/uploaders/decidim/conferences/partner_logo_uploader.rb
269
275
  - app/views/decidim/conference_speakers/_conference_speaker.html.erb
@@ -310,7 +316,6 @@ files:
310
316
  - app/views/decidim/conferences/conference_registration_mailer/confirmation.html.erb
311
317
  - app/views/decidim/conferences/conference_registration_mailer/pending_validation.html.erb
312
318
  - app/views/decidim/conferences/conference_speakers/index.html.erb
313
- - app/views/decidim/conferences/conference_widgets/show.html.erb
314
319
  - app/views/decidim/conferences/conferences/_partners.html.erb
315
320
  - app/views/decidim/conferences/conferences/_promoted_conference.html.erb
316
321
  - app/views/decidim/conferences/conferences/_statistics.html.erb
@@ -335,6 +340,8 @@ files:
335
340
  - config/locales/cs-CZ.yml
336
341
  - config/locales/cs.yml
337
342
  - config/locales/de.yml
343
+ - config/locales/el-GR.yml
344
+ - config/locales/el.yml
338
345
  - config/locales/en.yml
339
346
  - config/locales/eo-UY.yml
340
347
  - config/locales/es-MX.yml
@@ -348,6 +355,7 @@ files:
348
355
  - config/locales/gl.yml
349
356
  - config/locales/hu.yml
350
357
  - config/locales/id-ID.yml
358
+ - config/locales/is-IS.yml
351
359
  - config/locales/it.yml
352
360
  - config/locales/nl.yml
353
361
  - config/locales/no.yml
@@ -402,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
402
410
  - !ruby/object:Gem::Version
403
411
  version: '0'
404
412
  requirements: []
405
- rubygems_version: 3.0.3
413
+ rubygems_version: 3.1.2
406
414
  signing_key:
407
415
  specification_version: 4
408
416
  summary: Decidim conferences module
@@ -1,11 +0,0 @@
1
- <% content_for(:header, "false") %>
2
- <% content_for(:title, translated_attribute(model.title)) %>
3
- <p class="card__desc"><%= decidim_sanitize html_truncate(translated_attribute(model.short_description), length: 630, separator: "...") %></p>
4
- <% content_for(:footer) do %>
5
- <div class="card__support">
6
- <span class="card--process__small"></span>
7
- <%= link_to conference_path(model), class: "card__button button small" do %>
8
- <%= t("conference_widgets.show.take_part", scope: "layouts.decidim") %>
9
- <% end %>
10
- </div>
11
- <% end %>