decidim-assemblies 0.26.0.rc2 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e24ba3565165549a27459b0209a71a2260f0cbf56bd9868af7fa741c2b50447
-  data.tar.gz: 8681fa5e6e1c0a16018a5e53f6bcb0aebae5b9b408d7b8a5548d31c3fbabf715
+  metadata.gz: 344e04cccf08bd1451e5346a57a8d383148ad661e9291b48f5c0193de77eef72
+  data.tar.gz: 981cf77c8e5ffc50ded811bdd8d18f3c29f470350be24252ac59938f0932fd74
 SHA512:
-  metadata.gz: 370d16f886af6baaa39f906e9d3a377535c9a41a41bc84e63adc614717354fa56da05d13a85aa6d0ed7f23d5e8c40d969de5c7ca2bdb2610ef79972cbafd470a
-  data.tar.gz: eff4ca31120cf95814748bb2009f0d51269eecf3d8144a65ccf00b31697fed9be0c5935dc70da32b004d0eaff493bb1a5660e5a2531b5dcbc0ca74af02f0e048
+  metadata.gz: 8e4a6ab3ac34de4431ddb4f490ed2bda8bda4548cb4c36a5da7ba48639695ceb21314f2b1a4f500b63989a9074a065dfdcf3dd27f5e3de14a39850d34e42222c
+  data.tar.gz: d17c60e0e01a7694f6d5aa931d205b3d82b502ad281b71fcf176683e41e329e87056c1910f42adf0a463d109027e370726fd746a873966a8c4382bec51c9f452

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

@@ -17,7 +17,6 @@ module Decidim
           public_list_assemblies_action?
           public_read_assembly_action?
           public_list_members_action?
-          public_report_content_action?
           return permission_action
         end
 
@@ -125,13 +124,6 @@ module Decidim
         allow!
       end
 
-      def public_report_content_action?
-        return unless permission_action.action == :create &&
-                      permission_action.subject == :moderation
-
-        allow!
-      end
-
       # All users with a relation to a assembly and organization admins can enter
       # the space area. The sapce area is considered to be the assemblies zone,
       # not the assembly groups one.

data/app/views/decidim/assemblies/assemblies/show.html.erb

@@ -85,7 +85,7 @@ edit_link(
 
       <%= render_hook(:participatory_space_highlighted_elements) %>
 
-      <% if current_participatory_space.children.visible_for(current_user).count.positive? %>
+      <% if current_participatory_space.children.visible_for(current_user).published.count.positive? %>
         <section id="assemblies-grid" class="section row collapse">
           <h3 class="section-heading"><%= t("children", scope: "decidim.assemblies.show") %></h3>
           <div class="row small-up-1 medium-up-2 large-up-2 card-grid">

data/config/locales/no.yml

@@ -1,6 +1,8 @@
 "no":
   activemodel:
     attributes:
+      assemblies_setting:
+        enable_organization_chart: Aktiver organisasjonskart
       assembly:
         area_id: Område
         assembly_type: Forsamlingstype
@@ -50,6 +52,7 @@
         target: Hvem deltar
         title: Tittel
         twitter: Twitter
+        weight: Prioritert rekkefølge
         youtube: YouTube
       assembly_member:
         birthday: Fødselsdag
@@ -58,7 +61,9 @@
         designation_date: Valgdato
         full_name: Fullt navn
         gender: Kjønn
+        non_user_avatar: Profilbilde
         position: Stilling
+        user_id: Bruker eller gruppe
       assembly_user_role:
         email: Epost
         name: Navn
@@ -177,6 +182,9 @@
         update:
           error: Det oppstod et problem med å oppdatere en administrator for denne forsamlingen.
           success: Admin ble oppdatert for denne forsamlingen.
+      filters:
+        decidim_assemblies_type_id_eq:
+          label: Forsamlingstype
       menu:
         assemblies: Forsamlinger
         assemblies_settings: Innstillinger
@@ -245,6 +253,7 @@
         update: "%{user_name} oppdaterte forsamlingens innstillinger"
       assembly_type:
         create: "%{user_name} opprettet %{resource_name} forsamlingstypen"
+        delete: "%{user_name} fjernet forsamlingstypen %{resource_name}"
         publish: "%{user_name} publiserte %{resource_name} forsamlingstypen"
         unpublish: "%{user_name} avpubliserte %{resource_name} forsamlingstypen"
         update: "%{user_name} oppdaterte %{resource_name} forsamlingstypen"
@@ -256,6 +265,7 @@
       admin:
         assemblies:
           form:
+            announcement_help: Teksten du skriver her vil bli vist til brukeren rett under forsamlingsinformasjonen.
             duration: Varighet
             duration_help: Hvis varigheten av denne forsamlingen er limitert, velg en sluttdato. Hvis ikke, vil den vises som ubestemt.
             filters: Filter
@@ -289,7 +299,10 @@
         assembly_members:
           form:
             existing_user: Eksisterende deltaker
+            explanation: 'Veiledning for bilde:'
+            image_guide: Helst et portrettbilde uten tekst.
             non_user: Ingen deltakende
+            non_user_avatar_help: Du bør få samtykke fra personene før du offentliggjør dem som medlem.
             select_a_position: Velg en posisjon
             select_user: Velg en deltaker
             user_type: Deltakertype
@@ -415,6 +428,8 @@
     participatory_processes:
       show:
         related_assemblies: Relaterte forsamlinger
+    statistics:
+      assemblies_count: Forsamlinger
   errors:
     messages:
       cannot_be_blank: kan ikke være blank

data/lib/decidim/assemblies/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.26.0.rc2"
+      "0.26.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.26.0.rc2
+  version: 0.26.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -345,9 +345,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: