decidim-meetings 0.29.1 → 0.29.2

data/config/locales/lv.yml

@@ -47,6 +47,12 @@ lv:
         other: Reģistrācija
   decidim:
     admin:
+      filters:
+        meetings:
+          category_id_eq:
+            label: Kategorija
+          scope_id_eq:
+            label: Darbības tvērums
       meeting_copies:
         create:
           error: Šīs sanāksmes dublēšanas laikā radās problēma.
@@ -66,6 +72,7 @@ lv:
             default_registration_terms: Noklusējuma reģistrācijas noteikumi
             enable_pads_creation: Iespējot kopdokumentu izveidi
             resources_permissions_enabled: Katrā sanāksmē var iestatīt darbības atļaujas
+            scope_id: Darbības tvērums
           step:
             announcement: Paziņojums
             comments_blocked: Komentāri ir bloķēti
@@ -130,7 +137,6 @@ lv:
         attachment_collections: Mapes
         attachments: Pielikumi
         close: Aizvērt
-        confirm_destroy: Vai tiešām vēlaties dzēst šo sanāksmi?
         destroy: Dzēst
         edit: Labot
         preview: Priekšskatīt
@@ -267,6 +273,8 @@ lv:
           category: Kategorija
           date: Datums
           search: Meklēt
+        meeting:
+          close_meeting: Slēgt sanāksmi
         meetings:
           upcoming_meetings_warning: Pašlaik nav plānotas sanāksmes, taču šeit varat atrast visas iepriekšējās sanāksmes.
         registration_confirm:

data/config/locales/nl.yml

@@ -176,7 +176,6 @@ nl:
         attachment_collections: Mappen
         attachments: Bijlagen
         close: Sluit
-        confirm_destroy: Weet u zeker dat u deze vergadering wilt verwijderen?
         destroy: Verwijderen
         edit: Bewerk
         invalid_destroy:
@@ -421,6 +420,9 @@ nl:
           see_all: Alle vergaderingen bekijken
           see_all_withdrawn: Bekijk alle afgelaste vergaderingen
           text_banner: Je bekijkt de lijst van vergaderingen die zijn afgelast door hun maker. %{go_back_link}.
+        meeting:
+          close_meeting: Vergadering sluiten
+          edit_meeting: Vergadering bewerken
         meetings:
           upcoming_meetings_warning: Momenteel zijn er geen geplande vergaderingen, maar hier vindt u alle afgelopen vergaderingen.
         new:

data/config/locales/no.yml

@@ -170,7 +170,6 @@
         attachment_collections: Mapper
         attachments: Vedlegg
         close: Lukk
-        confirm_destroy: Er du sikker på at du vil slette dette møtet?
         destroy: Slett
         edit: Rediger
         invalid_destroy:
@@ -393,6 +392,9 @@
         index:
           click_here: Se alle møter
           new_meeting: Nytt møte
+        meeting:
+          close_meeting: Lukk møte
+          edit_meeting: Rediger møte
         meetings:
           upcoming_meetings_warning: For øyeblikket er det ingen planlagte møter, men her kan du finne alle de forrige møtene oppført.
         registration_confirm:

data/config/locales/pl.yml

@@ -241,7 +241,6 @@ pl:
         attachment_collections: Folder
         attachments: Załączniki
         close: Zamknij
-        confirm_destroy: Czy na pewno chcesz usunąć to spotkanie?
         destroy: Usuń
         edit: Edytuj
         invalid_destroy:

data/config/locales/pt-BR.yml

@@ -110,7 +110,7 @@ pt-BR:
               'false': Passado
               'true': Próximos
           scope_id_eq:
-            label: Escopo
+            label: Âmbito
           with_any_origin:
             label: Origem
             values:
@@ -159,7 +159,7 @@ pt-BR:
             maps_enabled: Mapas ativados
             registration_code_enabled: Código de registro habilitado
             resources_permissions_enabled: Permissões de ações podem ser definidas para cada encontro
-            scope_id: Escopo
+            scope_id: Âmbito
             scopes_enabled: Escopos habilitados
             terms_and_conditions_url_for_meeting_creators: URL de Termos e condições para criadores da reunião
           step:
@@ -234,7 +234,6 @@ pt-BR:
         attachment_collections: Pastas
         attachments: Anexos
         close: Fechar
-        confirm_destroy: Deseja mesmo excluir este encontro?
         destroy: Excluir
         edit: Editar
         invalid_destroy:
@@ -404,7 +403,7 @@ pt-BR:
           update: "%{user_name} atualizou o questionário para a reunião %{meeting_name}"
       application_helper:
         filter_category_values:
-          all: Todos
+          all: Tudo
         filter_meeting_space_values:
           all: Todos
       calendar:
@@ -523,9 +522,9 @@ pt-BR:
           see_all_withdrawn: Veja todas as reuniões retiradas
           text_banner: Você está vendo a lista de reuniões retiradas por seus autores. %{go_back_link}.
         meeting:
-          close_meeting: Encerrar reunião
+          close_meeting: Reunião próxima
           edit_close_meeting: Editar relatório da reunião
-          edit_meeting: Editar Reunião
+          edit_meeting: Editar reuniões
           join_meeting: Participe da reunião
         meetings:
           no_meetings_warning: Nenhuma reunião corresponde aos seus critérios de pesquisa ou não há nenhuma reunião agendada.

data/config/locales/pt.yml

@@ -171,7 +171,6 @@ pt:
         attachment_collections: Pastas
         attachments: Anexos
         close: Fechar
-        confirm_destroy: Tem a certeza de que deseja eliminar esta reunião?
         destroy: Eliminar
         edit: Editar
         invalid_destroy:
@@ -305,6 +304,9 @@ pt:
           value_types:
             organizer_presenter:
               not_found: 'O(A) organizador(a) não foi encontrado(a) na base de dados (ID: %{id})'
+      application_helper:
+        filter_category_values:
+          all: Todos
       calendar_modal:
         calendar_url: URL do calendário
         export_calendar: Exportar calendário
@@ -380,6 +382,9 @@ pt:
           select_a_registration_type: Por favor seleccione um tipo de registo
         index:
           new_meeting: Nova reunião
+        meeting:
+          close_meeting: Encerrar reunião
+          edit_meeting: Editar reunião
         meetings:
           upcoming_meetings_warning: Atualmente, não há reuniões agendadas, mas aqui pode encontrar listadas todas as reuniões passadas.
         new:

data/config/locales/ro-RO.yml

@@ -206,7 +206,6 @@ ro:
         attachment_collections: Dosare
         attachments: Atașamente
         close: Închide
-        confirm_destroy: Sigur dorești să ştergi acestă întâlnire?
         destroy: Ștergere
         edit: Editare
         invalid_destroy:
@@ -432,6 +431,7 @@ ro:
             all: Toate
             official: Oficial
             participants: Participanți
+            user_group: Grupuri
           search: Caută
           type: Tip
           type_values:
@@ -456,6 +456,9 @@ ro:
           see_all: Vezi toate întâlnirile
           see_all_withdrawn: Afișează toate întâlnirile anulate
           text_banner: Vizualizezi lista de întâlniri anulate de autorii lor. %{go_back_link}.
+        meeting:
+          close_meeting: Închide ședința
+          edit_meeting: Editați ședința
         meetings:
           upcoming_meetings_warning: În prezent, nu există întâlniri programate, dar aici se află pe listă toate întâlnirile anterioare.
         new:
@@ -570,7 +573,7 @@ ro:
     participatory_spaces:
       highlighted_meetings:
         past_meetings: Întâlniri anterioare
-        see_all: Afișează toate întâlnirile (%{count})
+        see_all: Afișează toate întâlnirile
         upcoming_meetings: Întâlniri viitoare
     resource_links:
       meetings_through_proposals:

data/config/locales/ru.yml

@@ -50,6 +50,12 @@ ru:
         other: Зарегистрировались
   decidim:
     admin:
+      filters:
+        meetings:
+          category_id_eq:
+            label: Категория
+          scope_id_eq:
+            label: Охват
       meeting_copies:
         create:
           error: При попытке создать копию этой встречи произошла ошибка.
@@ -68,6 +74,7 @@ ru:
             comments_enabled: Комментарии включены
             default_registration_terms: Условия регистрации по умолчанию
             resources_permissions_enabled: Для каждой встречи можно задать те или иные разрешения на действия
+            scope_id: Охват
           step:
             announcement: Объявление
             comments_blocked: Комментарии отключены
@@ -131,7 +138,6 @@ ru:
         attachment_collections: Папки
         attachments: Прикрепленные файлы
         close: Закрыть
-        confirm_destroy: Вы действительно хотите удалить эту встречу?
         destroy: Удалить
         edit: Редактировать
         preview: Предпросмотр
@@ -258,6 +264,8 @@ ru:
           category: Категория
           date: Дата
           search: Поиск
+        meeting:
+          close_meeting: Закрыть встречу
         meetings:
           upcoming_meetings_warning: Сейчас нет запланированных встреч, но здесь вы можете найти список всех прошедших встреч.
         registration_confirm:

data/config/locales/sk.yml

@@ -50,6 +50,12 @@ sk:
         other: Registrácie
   decidim:
     admin:
+      filters:
+        meetings:
+          category_id_eq:
+            label: Kategória
+          scope_id_eq:
+            label: Rozsah
       meeting_copies:
         create:
           error: Bolo tu chyba, že sa toto stretnutie zdvojnásobila.
@@ -69,6 +75,7 @@ sk:
             default_registration_terms: Východiskové podmienky registrácia
             enable_pads_creation: Povoliť vytvorenie zdieľaného texte
             resources_permissions_enabled: Nastavenie povolení možno nastaviť pre každú schôdzku
+            scope_id: Rozsah
           step:
             announcement: Oznámenie
             comments_blocked: Komentáre blokované
@@ -133,7 +140,6 @@ sk:
         attachment_collections: Zložky
         attachments: Prílohy
         close: Zavrieť
-        confirm_destroy: Naozaj chcete túto schôdzku vymazať?
         destroy: Odstrániť
         edit: Upraviť
         preview: Náhľad
@@ -271,6 +277,8 @@ sk:
           category: Kategória
           date: dátum
           search: Vyhľadávanie
+        meeting:
+          close_meeting: Zatvorte schôdzku
         meetings:
           upcoming_meetings_warning: V súčasnosti neexistujú žiadne plánované schôdzky, ale nájdete tu všetky minulé stretnutia.
         registration_confirm:

data/config/locales/tr-TR.yml

@@ -51,6 +51,12 @@ tr:
         other: Kayıtlar
   decidim:
     admin:
+      filters:
+        meetings:
+          category_id_eq:
+            label: Kategori
+          scope_id_eq:
+            label: kapsam
       meeting_copies:
         create:
           error: Bu toplantıyı kopyalarken bir sorun oluştu.
@@ -73,7 +79,7 @@ tr:
             enable_pads_creation: Altlık oluşturmayı etkinleştirin
             registration_code_enabled: Kayıt kodu etkinleştirildi
             resources_permissions_enabled: Her toplantı için işlem izinleri ayarlanabilir
-            scope_id: Kapsam
+            scope_id: kapsam
             scopes_enabled: Kapsamlar etkinleştirildi
             terms_and_conditions_url_for_meeting_creators: Toplantı oluşturucuları için şartlar ve koşullar URL'si
           step:
@@ -142,7 +148,6 @@ tr:
         attachment_collections: Klasörler
         attachments: Ekler
         close: Kapat
-        confirm_destroy: Bu toplantıyı silmek istediğinizden emin misiniz?
         destroy: Sil
         edit: Düzenle
         invalid_destroy:
@@ -269,6 +274,9 @@ tr:
           value_types:
             organizer_presenter:
               not_found: 'Organizatör veritabanında bulunamadı (ID: %{id})'
+      application_helper:
+        filter_category_values:
+          all: Tümü
       calendar:
         meeting_to_event:
           read_more: Bu toplantı hakkında daha fazlasını okuyun
@@ -335,6 +343,9 @@ tr:
           select_a_registration_type: Lütfen bir kayıt türü seçin
         index:
           new_meeting: Yeni toplantı
+        meeting:
+          close_meeting: Toplantıyı kapat
+          edit_meeting: Toplantıyı Düzenle
         meetings:
           upcoming_meetings_warning: Şu anda planlanmış bir toplantı yok, ancak burada listelenen tüm geçmiş toplantıları bulabilirsiniz.
         new:

data/config/locales/uk.yml

@@ -49,6 +49,12 @@ uk:
         other: Зареєстрованих
   decidim:
     admin:
+      filters:
+        meetings:
+          category_id_eq:
+            label: Категорія
+          scope_id_eq:
+            label: Обсяг
       meeting_copies:
         create:
           error: При спробі створити копію цієї зустрічі сталася помилка.
@@ -67,6 +73,7 @@ uk:
             comments_enabled: Коментарі увімкнено
             default_registration_terms: Умови реєстрації за умовчанням
             resources_permissions_enabled: Права на дії можна встановити для кожної зустрічі
+            scope_id: Обсяг
           step:
             announcement: Оголошення
             comments_blocked: Коментарі вимкнено
@@ -114,7 +121,6 @@ uk:
         attachment_collections: Теки
         attachments: Вкладені файли
         close: Закрити
-        confirm_destroy: Ви впевнені, що хочете видалити цю зустріч?
         destroy: Видалити
         edit: Редагувати
         preview: Попередній перегляд
@@ -231,6 +237,8 @@ uk:
           category: Категорія
           date: Дата
           search: Шукати
+        meeting:
+          close_meeting: Закрити зустріч
         meetings:
           upcoming_meetings_warning: Наразі нема запланованих зустрічей, але тут ви можете знайти перелік усіх попередніх зустрічей.
         registration_confirm:

data/config/locales/zh-CN.yml

@@ -43,6 +43,12 @@ zh-CN:
         other: 注册
   decidim:
     admin:
+      filters:
+        meetings:
+          category_id_eq:
+            label: 类别
+          scope_id_eq:
+            label: 范围
       meeting_copies:
         create:
           error: 重复这次会议时出现问题。
@@ -132,7 +138,6 @@ zh-CN:
         attachment_collections: 文件夹
         attachments: 附件
         close: 关闭
-        confirm_destroy: 您确定要删除这个会议吗？
         destroy: 删除
         edit: 编辑
         invalid_destroy:
@@ -249,6 +254,9 @@ zh-CN:
           value_types:
             organizer_presenter:
               not_found: '在数据库中找不到组织者 (ID: %{id})'
+      application_helper:
+        filter_category_values:
+          all: 所有的
       calendar_modal:
         calendar_url: 日历 URL
         export_calendar: 导出日历
@@ -295,6 +303,8 @@ zh-CN:
           select_a_category: 请选择一个类别
         index:
           new_meeting: 新会议
+        meeting:
+          close_meeting: 关闭会议
         meetings:
           upcoming_meetings_warning: 目前没有排定的会议，但在这里你可以找到过去所有会议的清单。
         new:

data/config/locales/zh-TW.yml

@@ -210,7 +210,6 @@ zh-TW:
         attachment_collections: 資料夾
         attachments: 附件
         close: 關閉
-        confirm_destroy: 你確定要刪除此會議？
         destroy: 刪除
         edit: 編輯
         invalid_destroy:
@@ -487,6 +486,9 @@ zh-TW:
           see_all: 查看所有會議
           see_all_withdrawn: 查看所有撤回的會議
           text_banner: 您正在查看已被其作者撤回的會議列表。 %{go_back_link}。
+        meeting:
+          close_meeting: 關閉會議
+          edit_meeting: 編輯會議
         meetings:
           no_meetings_warning: 沒有符合搜尋條件的會議或者目前沒有任何已排定的會議。
           upcoming_meetings_warning: 目前沒有安排的會議，但您可以在這裡找到所有過去的會議列表。

data/decidim-meetings.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::Meetings.version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
-  s.license = "AGPL-3.0"
+  s.license = "AGPL-3.0-or-later"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",

data/lib/decidim/api/meeting_type.rb

@@ -77,6 +77,18 @@ module Decidim
       field :type_of_meeting, GraphQL::Types::String, "The type of the meeting (online or in-person)", null: false
       field :online_meeting_url, GraphQL::Types::String, "The URL of the meeting (when the type is online)", null: false
       field :iframe_embed_type, GraphQL::Types::String, "The type of displaying of the online meeting URL", null: true
+
+      def self.authorized?(object, context)
+        context[:meeting] = object
+
+        chain = [
+          allowed_to?(:read, :meeting, object, context),
+          object.published?,
+          object.current_user_can_visit_meeting?(context[:current_user])
+        ].all?
+
+        super && chain
+      end
     end
   end
 end

data/lib/decidim/api/meetings_type.rb

@@ -2,9 +2,7 @@
 
 module Decidim
   module Meetings
-    class MeetingsType < Decidim::Api::Types::BaseObject
-      implements Decidim::Core::ComponentInterface
-
+    class MeetingsType < Decidim::Core::ComponentType
       graphql_name "Meetings"
       description "A meetings component of a participatory space."
 

data/lib/decidim/meetings/engine.rb

@@ -50,6 +50,8 @@ module Decidim
       end
 
       initializer "decidim_meetings.register_icons" do
+        Decidim.icons.register(name: "headphone-line", icon: "headphone-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "video-line", icon: "video-line", category: "system", description: "", engine: :meetings)
         Decidim.icons.register(name: "Decidim::Meetings::Meeting", icon: "map-pin-line", description: "Meeting", category: "activity", engine: :meetings)
         Decidim.icons.register(name: "in_person", icon: "community-line", description: "In person", category: "meetings", engine: :meetings)
         Decidim.icons.register(name: "online", icon: "webcam-line", description: "Online", category: "meetings", engine: :meetings)

data/lib/decidim/meetings/meeting_serializer.rb

@@ -25,6 +25,9 @@ module Decidim
             id: meeting.scope.try(:id),
             name: meeting.scope.try(:name)
           },
+          author: {
+            **author_fields
+          },
           participatory_space: {
             id: meeting.participatory_space.id,
             url: Decidim::ResourceLocatorPresenter.new(meeting.participatory_space).url
@@ -57,6 +60,40 @@ module Decidim
       attr_reader :meeting
       alias resource meeting
 
+      def author_fields
+        {
+          id: meeting.author.id,
+          name: author_name(meeting.author),
+          url: author_url(meeting.author)
+        }
+      end
+
+      def author_name(author)
+        translated_attribute(author.name)
+      end
+
+      def author_url(author)
+        if author.respond_to?(:nickname)
+          profile_url(author) # is a Decidim::User or Decidim::UserGroup
+        else
+          root_url # is a Decidim::Organization
+        end
+      end
+
+      def profile_url(author)
+        return "" if author.respond_to?(:deleted?) && author.deleted?
+
+        Decidim::Core::Engine.routes.url_helpers.profile_url(author.nickname, host:)
+      end
+
+      def root_url
+        Decidim::Core::Engine.routes.url_helpers.root_url(host:)
+      end
+
+      def host
+        resource.organization.host
+      end
+
       def component
         meeting.component
       end

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

@@ -64,6 +64,12 @@ FactoryBot.define do
       type_of_meeting { :in_person }
     end
 
+    trait :hidden do
+      after :create do |meeting, evaluator|
+        create(:moderation, hidden_at: Time.current, reportable: meeting, skip_injection: evaluator.skip_injection)
+      end
+    end
+
     trait :online do
       type_of_meeting { :online }
       online_meeting_url { "https://decidim.org" }

data/lib/decidim/meetings/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.29.1"
+      "0.29.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.29.1
+  version: 0.29.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
@@ -60,56 +60,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.29.2
 description: A meetings component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -382,6 +382,8 @@ files:
 - config/locales/ar.yml
 - config/locales/bg-BG.yml
 - config/locales/bg.yml
+- config/locales/bn-BD.yml
+- config/locales/bs-BA.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
@@ -549,7 +551,7 @@ files:
 - lib/tasks/decidim_meetings.rake
 homepage: https://decidim.org
 licenses:
-- AGPL-3.0
+- AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/decidim/decidim/issues
   documentation_uri: https://docs.decidim.org/