decidim-conferences 0.31.5 → 0.31.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/forms/decidim/conferences/admin/conference_duplicate_form.rb +1 -1
- data/app/forms/decidim/conferences/admin/conference_form.rb +1 -1
- data/app/views/decidim/conferences/admin/conferences/_actions.html.erb +1 -1
- data/app/views/decidim/conferences/conference_program/show.html.erb +1 -1
- data/app/views/decidim/conferences/conference_speakers/index.html.erb +1 -1
- data/app/views/decidim/conferences/conferences/show.html.erb +1 -1
- data/app/views/decidim/conferences/media/index.html.erb +1 -1
- data/app/views/decidim/conferences/registration_types/index.html.erb +1 -1
- data/config/locales/eu.yml +3 -3
- data/config/locales/sk.yml +4 -4
- data/lib/decidim/conferences/test/factories.rb +4 -0
- data/lib/decidim/conferences/version.rb +1 -1
- metadata +10 -10
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 17f8af098e3831c1bef65d20abaeafe476e5801aee2a8180be7e971b4c512203
|
|
4
|
+
data.tar.gz: 66b9bcf33063688b0f43930c3c3daea687968b2571f543766d3d6d41e6a1ef2c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c931acbb5e1fcfede9798fdffe145807bc04619fd751a2c71a0fc60486e9b4dad093b05ec587137145cf10e98943b10b086c18daa25a293e3201c395bb18f930
|
|
7
|
+
data.tar.gz: 0b18ae35576b4a2ff2196b41df4915f8f380402dadc625354551fb618dad87196c62952572c8b76b433e024004c8683220066598b1f9e96ff62e205f63c32301
|
|
@@ -23,7 +23,7 @@ module Decidim
|
|
|
23
23
|
private
|
|
24
24
|
|
|
25
25
|
def slug_uniqueness
|
|
26
|
-
return unless OrganizationConferences.new(current_organization).query.where(slug:).where.not(id:).any?
|
|
26
|
+
return unless OrganizationConferences.new(current_organization).query.with_deleted.where(slug:).where.not(id:).any?
|
|
27
27
|
|
|
28
28
|
errors.add(:slug, :taken)
|
|
29
29
|
end
|
|
@@ -90,7 +90,7 @@ module Decidim
|
|
|
90
90
|
end
|
|
91
91
|
|
|
92
92
|
def slug_uniqueness
|
|
93
|
-
return unless OrganizationConferences.new(current_organization).query.where(slug:).where.not(id: context[:conference_id]).any?
|
|
93
|
+
return unless OrganizationConferences.new(current_organization).query.where(slug:).with_deleted.where.not(id: context[:conference_id]).any?
|
|
94
94
|
|
|
95
95
|
errors.add(:slug, :taken)
|
|
96
96
|
end
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
<% if conference.published? %>
|
|
89
89
|
<li class="dropdown__item">
|
|
90
90
|
<div class="dropdown__button-disabled">
|
|
91
|
-
<%= with_tooltip t("tooltips.deleted_conferences_info", scope: "decidim.admin") do %>
|
|
91
|
+
<%= with_tooltip t("tooltips.deleted_conferences_info", scope: "decidim.admin"), class: :left do %>
|
|
92
92
|
<%= icon "delete-bin-line", class: "text-gray" %>
|
|
93
93
|
<span>
|
|
94
94
|
<%= t("decidim.admin.actions.soft_delete") %>
|
|
@@ -14,7 +14,7 @@ end
|
|
|
14
14
|
%>
|
|
15
15
|
|
|
16
16
|
<%# NOTE: this page does not use a regular layout %>
|
|
17
|
-
<main class="container">
|
|
17
|
+
<main class="container" role="main">
|
|
18
18
|
<h1 class="title-decorator my-12">
|
|
19
19
|
<span class="not-sr-only"><%= t(".program") %></span>
|
|
20
20
|
<span class="sr-only"><%= t(".program") %> (<%= translated_attribute current_participatory_space.title %>)</span>
|
|
@@ -20,7 +20,7 @@ edit_link(
|
|
|
20
20
|
include the hero inside the two-column layout.
|
|
21
21
|
Therefore is mandatory to pass the "main_enabled: false" flag
|
|
22
22
|
to the layout_two_col for disabling the original main. %>
|
|
23
|
-
<main>
|
|
23
|
+
<main role="main">
|
|
24
24
|
|
|
25
25
|
<%= content_for :aside do %>
|
|
26
26
|
<div class="conference__nav-container">
|
|
@@ -13,7 +13,7 @@ edit_link(
|
|
|
13
13
|
%>
|
|
14
14
|
|
|
15
15
|
<%# NOTE: this page does not use a regular layout %>
|
|
16
|
-
<main class="container">
|
|
16
|
+
<main class="container" role="main">
|
|
17
17
|
<h1 class="title-decorator my-12">
|
|
18
18
|
<span class="not-sr-only"><%= t("media", scope: "layouts.decidim.conferences_nav") %></span>
|
|
19
19
|
<span class="sr-only"><%= t("media", scope: "layouts.decidim.conferences_nav") %> (<%= translated_attribute current_participatory_space.title %>)</span>
|
data/config/locales/eu.yml
CHANGED
|
@@ -233,7 +233,7 @@ eu:
|
|
|
233
233
|
actions: Ekintzak
|
|
234
234
|
affiliation: Afiliazioa
|
|
235
235
|
full_name: Izen osoa
|
|
236
|
-
position:
|
|
236
|
+
position: Kokapena
|
|
237
237
|
name: Hizlaria
|
|
238
238
|
conference_user_role:
|
|
239
239
|
fields:
|
|
@@ -597,7 +597,7 @@ eu:
|
|
|
597
597
|
notification_title: <a href="%{resource_path}">%{resource_title}</a> jardunaldiak erregistroak gaitu ditu.
|
|
598
598
|
role_assigned:
|
|
599
599
|
email_intro: '%{role} rola esleitu zaizu <a href="%{resource_title}"> jardunaldian.'
|
|
600
|
-
email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu dizutelako "%{resource_title}"
|
|
600
|
+
email_outro: Jakinarazpen hau jaso duzu %{role} rola esleitu dizutelako "%{resource_title}" jardunaldian.
|
|
601
601
|
email_subject: '%{role} rola esleitu zaizu <a href="%{resource_title}"> batzarrean.'
|
|
602
602
|
notification_title: '%{role} rola esleitu zaizu <a href="%{resource_url}">%{resource_title}</a> batzarrean.'
|
|
603
603
|
upcoming_conference:
|
|
@@ -667,7 +667,7 @@ eu:
|
|
|
667
667
|
promoted_conferences: Sustatutako jardunaldiak
|
|
668
668
|
order_by_conferences:
|
|
669
669
|
conferences:
|
|
670
|
-
one: "
|
|
670
|
+
one: "%{count} jardunaldi"
|
|
671
671
|
other: "%{count} jardunaldi"
|
|
672
672
|
conferences_nav:
|
|
673
673
|
conference_partners_menu_item: Kideak
|
data/config/locales/sk.yml
CHANGED
|
@@ -501,7 +501,7 @@ sk:
|
|
|
501
501
|
show:
|
|
502
502
|
already_have_an_account?: Už máte účet?
|
|
503
503
|
are_you_new?: Nový účastník?
|
|
504
|
-
login_as: Ste prihlásení ako %{name} %{email}
|
|
504
|
+
login_as: Ste prihlásení ako %{name} %{email}
|
|
505
505
|
make_conference_registration: Zaregistrovať sa na konferenciu
|
|
506
506
|
manage_registration: Spravovať registráciu
|
|
507
507
|
register: Registrovať
|
|
@@ -591,10 +591,10 @@ sk:
|
|
|
591
591
|
conference_registration_validation_pending:
|
|
592
592
|
notification_title: Vaša registrácia na konferencii <a href="%{resource_url}">%{resource_title}</a> čaká na potvrdenie.
|
|
593
593
|
conference_registrations_over_percentage:
|
|
594
|
-
email_intro: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %.
|
|
594
|
+
email_intro: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %.
|
|
595
595
|
email_outro: Túto notifikáciu ste dostali, pretože ste administrátorom participatívneho priestoru konferencie.
|
|
596
|
-
email_subject: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %.
|
|
597
|
-
notification_title: Konferencia <a href="%{resource_path}">%{resource_title}</a> je obsadená na viac, než %{percentage} %.
|
|
596
|
+
email_subject: Konferencia "%{resource_title}" je obsadená na viac, než%{percentage} %.
|
|
597
|
+
notification_title: Konferencia <a href="%{resource_path}">%{resource_title}</a> je obsadená na viac, než %{percentage} %.
|
|
598
598
|
conference_updated:
|
|
599
599
|
email_intro: 'Konferencia "%{resource_title}" bola aktualizovaná. Novú verziu si môžete pozrieť na jej stránke:'
|
|
600
600
|
email_outro: Túto notifikáciu ste dostali, pretože sledujete konferenciu "%{resource_title}". Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
|
|
@@ -44,6 +44,10 @@ FactoryBot.define do
|
|
|
44
44
|
published_at { Time.current }
|
|
45
45
|
end
|
|
46
46
|
|
|
47
|
+
trait :trashed do
|
|
48
|
+
deleted_at { Time.current }
|
|
49
|
+
end
|
|
50
|
+
|
|
47
51
|
trait :diploma do
|
|
48
52
|
main_logo { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
|
|
49
53
|
signature { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
|
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.31.
|
|
4
|
+
version: 0.31.6
|
|
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: 2026-
|
|
11
|
+
date: 2026-07-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: decidim-core
|
|
@@ -16,56 +16,56 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - '='
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 0.31.
|
|
19
|
+
version: 0.31.6
|
|
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.31.
|
|
26
|
+
version: 0.31.6
|
|
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.31.
|
|
33
|
+
version: 0.31.6
|
|
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.31.
|
|
40
|
+
version: 0.31.6
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: decidim-admin
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
44
44
|
requirements:
|
|
45
45
|
- - '='
|
|
46
46
|
- !ruby/object:Gem::Version
|
|
47
|
-
version: 0.31.
|
|
47
|
+
version: 0.31.6
|
|
48
48
|
type: :development
|
|
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.31.
|
|
54
|
+
version: 0.31.6
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
56
|
name: decidim-dev
|
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
|
58
58
|
requirements:
|
|
59
59
|
- - '='
|
|
60
60
|
- !ruby/object:Gem::Version
|
|
61
|
-
version: 0.31.
|
|
61
|
+
version: 0.31.6
|
|
62
62
|
type: :development
|
|
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.31.
|
|
68
|
+
version: 0.31.6
|
|
69
69
|
description: Conferences component for decidim.
|
|
70
70
|
email:
|
|
71
71
|
- isaac.mg@coditramuntana.com
|