decidim-assemblies 0.28.4 → 0.28.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a96e6c34d80c5256ca5da335a25de147e9fee9ab6a451eae435ecefbc41c4aec
-  data.tar.gz: b0f0a58481be26eb3acb13a63e6894fdaa8c72ff00b2830c84e80e277dfc691f
+  metadata.gz: e0ea09705908c1754307ceda205d833ed2e3572acb82817d8d471252cb4138f0
+  data.tar.gz: 66ef27f99777f2e9755c4fdd56dd68a201de2829475a11329abc571e5d9c87b7
 SHA512:
-  metadata.gz: aadfbbffa02fa1773355e37e3db335cd9ebd51edb7d143297ecf89398393af62b43310cea35a66ca653f7ab7a3a05b9934ca0a31614ccfa7bd3cc19ca427b7be
-  data.tar.gz: fd37d3cd9f695dbec77149a28219b3d7e7e2aa7ca6a603eca61a1209885124386cd1e74a314b2de3d57d1e110c8c33364a29cfe3e20c8946a1b25bfbd1ae263d
+  metadata.gz: 82fbf7e3146ea2aa10d66dbc79f3aae00d9a4edc86c823d611cd3bd1ab1d662a4c604fbfaf9d68ca5e71a3a0492a5ac283ac77852ff3e821db14f90370b558e9
+  data.tar.gz: 6aa047f240c99b95fae6a27b52da28223bf3af5b827f51d4fa53ef514dcf21a7ced3ca929d916be30793aac31d1c784bc67661720d0ff44e6bfc0ecc561ad3ed

data/app/controllers/decidim/assemblies/admin/assembly_landing_page_content_blocks_controller.rb

@@ -10,6 +10,8 @@ module Decidim
 
         layout "decidim/admin/assemblies"
 
+        helper_method :parent_assembly
+
         private
 
         def content_block_scope
@@ -29,6 +31,10 @@ module Decidim
         def resource_landing_page_content_block_path
           assembly_landing_page_content_block_path(scoped_resource, params[:id])
         end
+
+        def parent_assembly
+          scoped_resource.parent
+        end
       end
     end
   end

data/app/forms/decidim/assemblies/admin/assembly_form.rb

@@ -14,23 +14,23 @@ module Decidim
 
         mimic :assembly
 
-        translatable_attribute :composition, String
-        translatable_attribute :closing_date_reason, String
+        translatable_attribute :composition, Decidim::Attributes::RichText
+        translatable_attribute :closing_date_reason, Decidim::Attributes::RichText
         translatable_attribute :created_by_other, String
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
         translatable_attribute :developer_group, String
-        translatable_attribute :internal_organisation, String
+        translatable_attribute :internal_organisation, Decidim::Attributes::RichText
         translatable_attribute :local_area, String
         translatable_attribute :meta_scope, String
         translatable_attribute :participatory_scope, String
         translatable_attribute :participatory_structure, String
-        translatable_attribute :purpose_of_action, String
-        translatable_attribute :short_description, String
-        translatable_attribute :special_features, String
+        translatable_attribute :purpose_of_action, Decidim::Attributes::RichText
+        translatable_attribute :short_description, Decidim::Attributes::RichText
+        translatable_attribute :special_features, Decidim::Attributes::RichText
         translatable_attribute :subtitle, String
         translatable_attribute :target, String
         translatable_attribute :title, String
-        translatable_attribute :announcement, String
+        translatable_attribute :announcement, Decidim::Attributes::RichText
 
         attribute :created_by, String
         attribute :facebook_handler, String

data/app/models/decidim/assembly.rb

@@ -122,6 +122,11 @@ module Decidim
       Decidim::Assemblies::AdminLog::AssemblyPresenter
     end
 
+    # This is a overwrite for Decidim::ParticipatorySpaceResourceable.visible?
+    def visible?
+      published? && (!private_space? || (private_space? && is_transparent?))
+    end
+
     def hashtag
       attributes["hashtag"].to_s.delete("#")
     end
@@ -149,7 +154,7 @@ module Decidim
     end
 
     def user_roles(role_name = nil)
-      roles = Decidim::AssemblyUserRole.where(assembly: self_and_ancestors)
+      roles = Decidim::AssemblyUserRole.order_by_name.where(assembly: self_and_ancestors)
       return roles if role_name.blank?
 
       roles.where(role: role_name)

data/app/permissions/decidim/assemblies/permissions.rb

@@ -3,6 +3,8 @@
 module Decidim
   module Assemblies
     class Permissions < Decidim::DefaultPermissions
+      include Decidim::UserRoleChecker
+
       def permissions
         user_can_enter_space_area?
 
@@ -34,6 +36,7 @@ module Decidim
         user_can_create_assembly?
         user_can_export_assembly?
         user_can_copy_assembly?
+        user_can_upload_images_in_assembly?
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
@@ -314,6 +317,11 @@ module Decidim
           Decidim::Assembly.where(id: assemblies + child_assemblies)
         end
       end
+
+      # Checks if the assigned admins can upload images on the editor
+      def user_can_upload_images_in_assembly?
+        allow! if user&.admin_terms_accepted? && user_has_any_role?(user, assembly, broad_check: true) && (permission_action.subject == :editor_image)
+      end
     end
   end
 end

data/app/presenters/decidim/assemblies/assembly_presenter.rb

@@ -6,11 +6,11 @@ module Decidim
       include Decidim::TranslationsHelper
 
       def hero_image_url
-        assembly.attached_uploader(:hero_image).url(host: assembly.organization.host)
+        assembly.attached_uploader(:hero_image).url
       end
 
       def banner_image_url
-        assembly.attached_uploader(:banner_image).url(host: assembly.organization.host)
+        assembly.attached_uploader(:banner_image).url
       end
 
       def area_name

data/config/locales/ar.yml

@@ -48,7 +48,7 @@ ar:
         promoted: سلط الضوء
         published_at: نشرت في
         purpose_of_action: الغرض من العمل
-        scope_id: نطاق
+        scope_id: النطاق
         scopes_enabled: النطاقات المُفعّلَة
         short_description: وصف قصير
         show_statistics: عرض الإحصائيات
@@ -188,7 +188,7 @@ ar:
           success: تم تحديث المشرف على هذه الجمعية بنجاح.
       filters:
         decidim_assemblies_type_id_eq:
-          label: نوع الجمعية
+          label: نوع التجمع
       menu:
         assemblies: الجمعيات
         assemblies_submenu:
@@ -200,7 +200,7 @@ ar:
           categories: الفئات
           components: المكونات
           moderations: الإعتدال
-        assemblies_types: نوع التجمّعات
+        assemblies_types: أنواع التجمّعات
       models:
         assemblies_types:
           fields:
@@ -208,6 +208,7 @@ ar:
             title: العنوان
         assembly:
           fields:
+            actions: الإجراءات
             created_at: تاريخ الإنشاء
             private: خاص
             promoted: سلط الضوء
@@ -219,7 +220,7 @@ ar:
             ceased_date: تاريخ التوقف
             designation_date: تاريخ التعيين
             full_name: الاسم
-            position: موضع
+            position: الموقع
           name: عضو
           positions:
             other: آخر
@@ -315,9 +316,9 @@ ar:
         commission: اللجنة
         consultative_advisory: استشاري / الاستشارية
         executive: تنفيذية
-        government: حكومية
+        government: الحكومية
         others: أخرى
-        participatory: تشاركية
+        participatory: التشاركية
         working_group: فريق العمل
       content_blocks:
         children_assemblies:
@@ -347,7 +348,7 @@ ar:
           member_of:
             member_of: عضو في
       show:
-        assembly_type: نوع الجمعية
+        assembly_type: نوع التجمع
         duration: المدة الزمنية
         is_transparent:
           'false': مبهمة

data/config/locales/bn-BD.yml

@@ -0,0 +1 @@
+bn:

data/config/locales/bs-BA.yml

@@ -0,0 +1,44 @@
+---
+bs:
+  decidim:
+    admin:
+      actions:
+        new_assembly_type: Novi tip veća
+      assemblies_types:
+        create:
+          error: Nastao je problem pri stvaranju novog tipa veća.
+          success: Tip veća uspešno stvoren.
+        destroy:
+          success: Tip veća uspešno obrisan.
+        new:
+          title: Novi tip veća
+        update:
+          error: Nastao je problem pri ažuriranju ovog tipa veća.
+          success: Tip veća uspešno ažuriran.
+      menu:
+        assemblies_types: Tipovi veća
+      models:
+        assembly_user_role:
+          roles:
+            valuator: Procenjivač
+      titles:
+        assemblies_types: Tipovi veća
+    admin_log:
+      assembly_type:
+        create: "%{user_name} je stvorio tip veća %{resource_name}"
+        publish: "%{user_name} je objavio tip veća %{resource_name}"
+        unpublish: "%{user_name} je odustao od objavljivanja tipa veća %{resource_name}"
+        update: "%{user_name} je ažurirao tip veća %{resource_name}"
+    events:
+      assemblies:
+        create_assembly_member:
+          email_subject: Pozvani ste da postanete član veća %{resource_name}!
+      assembly:
+        role_assigned:
+          email_intro: Imenovani ste na funkciju %{role} veća %{resource_title}.
+          email_outro: Dobili ste ovo obaveštenje zbog toga što ste %{role} veća %{resource_title}.
+          email_subject: Imenovani ste na funkciju %{role} %{resource_title}.
+    log:
+      value_types:
+        assembly_type_presenter:
+          not_found: 'Ovaj tip veća nije pronađen u bazi podataka (ID: %{id})'