decidim-assemblies 0.13.1 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0cfe9dab6ab3f78fbb6bbf3fb29b0b1f76222fb14923d608724fca412e51a6b
-  data.tar.gz: 03a45f4af955a614d549c988e9912664d730ac97179044d342e7f2265cd87696
+  metadata.gz: 8a1cce146b08aee21bd8f3370beb76ff2a75c3f31ad642502d355f736070a37f
+  data.tar.gz: f1ac77939bfbc47d8c28b0421389150f9b201e329f9ac59e48e12916986e4e92
 SHA512:
-  metadata.gz: e13e2e501fc4b307639523e2dea690d69a451ba1ae09b23a3c6cf769c78164c0026f46f8dcbd6b677e99749cbbdac683390dbd2da7016fb3e2ca096eb206ff58
-  data.tar.gz: d1ca83cce5e4a99ebe8988e29495f8149612d6c51ac927a3253a7e0e20cc4abadb4a31220bc8f8641ab4e65395f5728520405c2e75c0d479a6128868ee9831ac
+  metadata.gz: 239a621b615bde42e4dea6f64875ca9e96e5e754f3e3a58cb6ea04936177ae21632efa65e4e741f2bfa445a185db2969ba8d7314d9d103b0c21b36b860f11ca2
+  data.tar.gz: ed47664aacf5eefe2e8a887cf22693236c895d4a17d690013558f6407f8f8a8d7606fba008abf5b8f41b4ca4158356c26316aa75bce6f2bd7f62fca7db26cfcd

data/app/cells/decidim/assemblies/assembly_cell.rb

@@ -6,7 +6,7 @@ module Decidim
     # the default size is the Medium Card (:m)
     class AssemblyCell < Decidim::ViewModel
       def show
-        cell card_size, model
+        cell card_size, model, options
       end
 
       private

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb

@@ -0,0 +1,31 @@
+<section class="wrapper-home home-section">
+  <div class="row" id="highlighted-assemblies">
+    <h3 class="section-heading"><%= t("active_assemblies", scope: i18n_scope) %></h3>
+    <div class="row collapse">
+      <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-3
+        large-up-4 card-grid">
+        <% highlighted_assemblies.each do |assembly| %>
+          <div class="column">
+            <article class="card card--assembly card--mini">
+              <%= link_to decidim_assemblies.assembly_path(assembly), class: "card__link" do %>
+                <div class="card__image-top"
+                  style="background-image:url(<%= assembly.hero_image.url %>)"></div>
+              <% end %>
+              <div class="card__content">
+                <%= link_to decidim_assemblies.assembly_path(assembly), class: "card__link" do %>
+                  <h4 class="card__title"><%= translated_attribute assembly.title %></h4>
+                <% end %>
+              </div>
+            </article>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+  <div class="row" id="see-all-assemblies">
+    <div class="columns small-centered small-12
+      smallmedium-8 medium-6 large-4">
+      <%= link_to t("see_all_assemblies", scope: i18n_scope), decidim_assemblies.assemblies_path, class: "button expanded hollow button--sc home-section__cta" %>
+    </div>
+  </div>
+</section>

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module ContentBlocks
+      class HighlightedAssembliesCell < Decidim::ViewModel
+        delegate :current_organization, to: :controller
+        delegate :current_user, to: :controller
+
+        def show
+          render if highlighted_assemblies.any?
+        end
+
+        def highlighted_assemblies
+          OrganizationPrioritizedAssemblies.new(current_organization, current_user)
+        end
+
+        def i18n_scope
+          "decidim.assemblies.pages.home.highlighted_assemblies"
+        end
+
+        def decidim_assemblies
+          Decidim::Assemblies::Engine.routes.url_helpers
+        end
+      end
+    end
+  end
+end

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

@@ -9,6 +9,8 @@ module Decidim
         helper_method :current_assembly, :parent_assembly, :parent_assemblies, :current_participatory_space
         layout "decidim/admin/assemblies"
 
+        before_action :set_all_assemblies, except: [:index, :destroy]
+
         def index
           enforce_permission_to :read, :assembly_list
           @assemblies = collection
@@ -78,6 +80,10 @@ module Decidim
 
         private
 
+        def set_all_assemblies
+          @all_assemblies = OrganizationAssemblies.new(current_user.organization).query
+        end
+
         def current_assembly
           scope = OrganizationAssemblies.new(current_user.organization).query
           @current_assembly ||= scope.where(slug: params[:slug]).or(

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

@@ -16,10 +16,6 @@ module Decidim
         def collection_for
           current_assembly
         end
-
-        def authorization_object
-          @attachment_collection || AttachmentCollection
-        end
       end
     end
   end

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

@@ -17,10 +17,6 @@ module Decidim
         def attached_to
           current_assembly
         end
-
-        def authorization_object
-          @attachment || Attachment
-        end
       end
     end
   end

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

@@ -16,10 +16,6 @@ module Decidim
         def privatable_to
           current_assembly
         end
-
-        def authorization_object
-          @participatory_space_private_user || ParticipatorySpacePrivateUser
-        end
       end
     end
   end

data/app/models/decidim/assembly.rb

@@ -115,6 +115,10 @@ module Decidim
       return false if private_space? && is_transparent?
     end
 
+    def translated_title
+      Decidim::AssemblyPresenter.new(self).translated_title
+    end
+
     private
 
     # When an assembly changes their parent, we need to update the parents_path attribute

data/app/presenters/decidim/assembly_presenter.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  #
+  # Decorator for areas
+  #
+  class AssemblyPresenter < SimpleDelegator
+    include Decidim::TranslationsHelper
+
+    def translated_title
+      @translated_title ||= translated_attribute title
+    end
+  end
+end

data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb

@@ -1,7 +1,5 @@
 <%= javascript_include_tag "decidim/slug_form" %>
 
-<%= form.hidden_field :parent_id, value: @form.parent_id %>
-
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title"><%= t "assemblies.form.title", scope: "decidim.admin" %></h2>
@@ -16,6 +14,14 @@
       <%= form.translated :text_field, :subtitle %>
     </div>
 
+    <% if params[:parent_id].present? %>
+      <%= form.hidden_field :parent_id, value: @form.parent_id %>
+    <% else %>
+      <div class="row column">
+        <%= form.select :parent_id, options_from_collection_for_select(@all_assemblies, :id, :translated_title, selected: current_assembly.try(:parent_id)), include_blank: t(".select_parent_assembly") %>
+      </div>
+    <% end %>
+
     <div class="row">
       <div class="columns xlarge-6 slug">
         <%= form.text_field :slug %>

data/app/views/decidim/assemblies/admin/assembly_copies/new.html.erb

@@ -1,5 +1,5 @@
 <%= decidim_form_for(@form, url: assembly_copies_path(current_assembly), method: :post, html: { class: "form copy_assembly" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t("assembly_copies.new.title", scope: "decidim.admin"), select: t("assembly_copies.new.select", scope: "decidim.admin")} %>
+  <%= render partial: "form", object: f, locals: { title: t("assembly_copies.new.title", scope: "decidim.admin"), select: t("assembly_copies.new.select", scope: "decidim.admin") } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t("assembly_copies.new.copy", scope: "decidim.admin") %>

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

@@ -1,5 +1,13 @@
 <% add_decidim_meta_tags(title: t("assemblies.index.title", scope: "decidim")) %>
 
+<%
+edit_link(
+  decidim_admin_assemblies.assemblies_path,
+  :read,
+  :assembly_list
+)
+%>
+
 <main class="wrapper">
   <% if promoted_assemblies.any? %>
     <section id="highlighted-assemblies" class="row section">

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

@@ -5,6 +5,15 @@
   twitter_handler: current_organization.twitter_handler
 }) %>
 
+<%
+edit_link(
+  resource_locator(current_participatory_space).edit,
+  :update,
+  :assembly,
+  assembly: current_participatory_space
+)
+%>
+
 <% if current_participatory_space.private_space? %>
   <%= render partial: "decidim/shared/private_participatory_space", locals: { text: t("assemblies.show.private_space", scope: "decidim") } %>
 <% end %>

data/app/views/layouts/decidim/assembly.html.erb

@@ -19,8 +19,6 @@
       </div>
     </div>
   <% end %>
-
-  <%= render "layouts/decidim/component_authorization_modals" %>
 <% end %>
 
 <% provide :meta_image_url, current_participatory_space.banner_image.url %>

data/config/locales/ca.yml

@@ -29,11 +29,12 @@ ca:
         instagram: Instagram
         internal_organisation: Organització interna
         is_transparent: És transparent
-        local_area: Àrea municipal
+        local_area: Àrea d'organització
         meta_scope: Metadades d'àmbit
+        parent_id: Assemblea principal
         participatory_processes_ids: Processos participatius relacionats
-        participatory_scope: Àmbit participatiu
-        participatory_structure: Estructura participativa
+        participatory_scope: El que es decideix
+        participatory_structure: Com es decideix
         private_space: Espai privat
         promoted: Destacat
         published_at: Publicat el
@@ -45,7 +46,7 @@ ca:
         slug: Nom curt d'URL
         special_features: Característiques especials
         subtitle: Subtítol
-        target: A qui va dirigit?
+        target: Qui participa
         title: Títol
         twitter: Twitter
         youtube: YouTube
@@ -217,6 +218,7 @@ ca:
             select_a_created_by: Selecciona un creador
             select_an_area: Selecciona una àrea
             select_an_assembly_type: Seleccioneu un tipus d'assemblea
+            select_parent_assembly: Seleccioneu una assemblea principal
             slug_help: 'Els noms curts d''URL s''utilitzen per generar les URL que apunten a aquesta assemblea. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
             social_handlers: Social
         assembly_copies:
@@ -247,6 +249,9 @@ ca:
         others: Altres
         participatory: Participativa
         working_group: Grup de treball
+      content_blocks:
+        highlighted_assemblies:
+          name: Asemblees destacades
       created_by:
         city_council: Ajuntament
         others: Altres
@@ -277,9 +282,9 @@ ca:
         is_transparent:
           'false': opaca
           'true': transparent
-        local_area: Àrea municipal
-        participatory_scope: Àmbit participatiu
-        participatory_structure: Estructura participativa
+        local_area: Àrea d'organització
+        participatory_scope: El que es decideix
+        participatory_structure: Com es decideix
         private_space: Aquesta és una assemblea privada
         purpose_of_action: Propòsit de l'acció
         read_less: Llegir menys
@@ -287,7 +292,7 @@ ca:
         related_participatory_processes: Processos participatius relacionats
         scope: Àmbit
         social_networks: Xarxes socials
-        target: A qui va dirigit
+        target: Qui participa
       statistics:
         answers_count: Respostes
         assemblies_count: Assemblees

data/config/locales/en.yml

@@ -30,11 +30,12 @@ en:
         instagram: Instagram
         internal_organisation: Internal organisation
         is_transparent: Is transparent
-        local_area: Local area
+        local_area: Organization area
         meta_scope: Scope metadata
+        parent_id: Parent assembly
         participatory_processes_ids: Related Participatory processes
-        participatory_scope: Participatory scope
-        participatory_structure: Participatory structure
+        participatory_scope: What is decided
+        participatory_structure: How is it decided
         private_space: Private space
         promoted: Promoted
         published_at: Published at
@@ -46,7 +47,7 @@ en:
         slug: URL slug
         special_features: Special features
         subtitle: Subtitle
-        target: Target
+        target: Who participates
         title: Title
         twitter: Twitter
         youtube: YouTube
@@ -218,6 +219,7 @@ en:
             select_a_created_by: Select a created by
             select_an_area: Select an Area
             select_an_assembly_type: Select an assembly type
+            select_parent_assembly: Select parent assembly
             slug_help: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
             social_handlers: Social
         assembly_copies:
@@ -248,6 +250,9 @@ en:
         others: Others
         participatory: Participatory
         working_group: Working group
+      content_blocks:
+        highlighted_assemblies:
+          name: Highlighted assemblies
       created_by:
         city_council: City Council
         others: Others
@@ -278,9 +283,9 @@ en:
         is_transparent:
           'false': opaque
           'true': transparent
-        local_area: Local area
-        participatory_scope: Participatory scope
-        participatory_structure: Participatory structure
+        local_area: Organization area
+        participatory_scope: What is decided
+        participatory_structure: How is it decided
         private_space: This is a private assembly
         purpose_of_action: Purpose of action
         read_less: Read less
@@ -288,7 +293,7 @@ en:
         related_participatory_processes: Related participatory processes
         scope: Scope
         social_networks: Social Networks
-        target: Target
+        target: Who participates
       statistics:
         answers_count: Answers
         assemblies_count: Assemblies

data/config/locales/es-PY.yml

@@ -29,11 +29,12 @@ es-PY:
         instagram: Instagram
         internal_organisation: Organización interna
         is_transparent: Es transparente
-        local_area: Áreas municipales
+        local_area: Área de organización
         meta_scope: 'Metadatos: ámbito'
+        parent_id: Asamblea principal
         participatory_processes_ids: Procesos participativos relacionados
-        participatory_scope: Ámbito participativo
-        participatory_structure: Estructura participativa
+        participatory_scope: Qué se decide
+        participatory_structure: Cómo se decide
         private_space: Espacio privado
         promoted: Destacado
         published_at: Publicado
@@ -45,7 +46,7 @@ es-PY:
         slug: Texto corto de URL
         special_features: Características especiales
         subtitle: Subtítulo
-        target: '¿A quién va dirigido?'
+        target: Quién participa
         title: Título
         twitter: Twitter
         youtube: Youtube
@@ -217,6 +218,7 @@ es-PY:
             select_a_created_by: Selecciona creada por
             select_an_area: Seleccione un Área
             select_an_assembly_type: Selecciona tipo de asamblea
+            select_parent_assembly: Seleccionar ensamblaje principal
             slug_help: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a esta asamblea. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
             social_handlers: Social
         assembly_copies:
@@ -247,6 +249,9 @@ es-PY:
         others: Otros
         participatory: Participativo
         working_group: Grupo de trabajo
+      content_blocks:
+        highlighted_assemblies:
+          name: Asambleas destacadas
       created_by:
         city_council: Ayuntamiento
         others: Otros
@@ -277,9 +282,9 @@ es-PY:
         is_transparent:
           'false': opaco
           'true': transparente
-        local_area: Áreas municipales
-        participatory_scope: Ámbito participativo
-        participatory_structure: Estructura participativa
+        local_area: Área de organización
+        participatory_scope: Qué se decide
+        participatory_structure: Cómo se decide
         private_space: Esta es una asamblea privada
         purpose_of_action: Propósito de la acción
         read_less: Leer menos
@@ -287,7 +292,7 @@ es-PY:
         related_participatory_processes: Procesos participativos relacionados
         scope: Ámbito
         social_networks: Redes sociales
-        target: '¿A quién va dirigida?'
+        target: Quién participa
       statistics:
         answers_count: Respuestas
         assemblies_count: Asambleas

data/config/locales/es.yml

@@ -29,11 +29,12 @@ es:
         instagram: Instagram
         internal_organisation: Organización interna
         is_transparent: Es transparente
-        local_area: Áreas municipales
+        local_area: Área de organización
         meta_scope: 'Metadatos: ámbito'
+        parent_id: Asamblea padre
         participatory_processes_ids: Procesos participativos relacionados
-        participatory_scope: Ámbito participativo
-        participatory_structure: Estructura participativa
+        participatory_scope: Qué se decide
+        participatory_structure: Cómo se decide
         private_space: Espacio privado
         promoted: Destacado
         published_at: Publicado
@@ -45,7 +46,7 @@ es:
         slug: Texto corto de URL
         special_features: Características especiales
         subtitle: Subtítulo
-        target: '¿A quién va dirigido?'
+        target: Quién participa
         title: Título
         twitter: Twitter
         youtube: Youtube
@@ -217,6 +218,7 @@ es:
             select_a_created_by: Selecciona creada por
             select_an_area: Seleccione un Área
             select_an_assembly_type: Selecciona tipo de asamblea
+            select_parent_assembly: Selecciona asamblea principal
             slug_help: 'Los textos cortos de URL se utilizan para generar las URL que apuntan a esta asamblea. Sólo acepta letras, números y guiones, y debe comenzar con una letra. Ejemplo: %{url}'
             social_handlers: Social
         assembly_copies:
@@ -247,6 +249,9 @@ es:
         others: Otros
         participatory: Participativo
         working_group: Grupo de trabajo
+      content_blocks:
+        highlighted_assemblies:
+          name: Asambleas destacadas
       created_by:
         city_council: Ayuntamiento
         others: Otros
@@ -277,9 +282,9 @@ es:
         is_transparent:
           'false': opaco
           'true': transparente
-        local_area: Áreas municipales
-        participatory_scope: Ámbito participativo
-        participatory_structure: Estructura participativa
+        local_area: Área de organización
+        participatory_scope: Qué se decide
+        participatory_structure: Cómo se decide
         private_space: Esta es una asamblea privada
         purpose_of_action: Propósito de la acción
         read_less: Leer menos
@@ -287,7 +292,7 @@ es:
         related_participatory_processes: Procesos participativos relacionados
         scope: Ámbito
         social_networks: Redes sociales
-        target: '¿A quién va dirigida?'
+        target: Quién participa
       statistics:
         answers_count: Respuestas
         assemblies_count: Asambleas