decidim-assemblies 0.21.0 → 0.22.0

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

@@ -30,8 +30,10 @@ module Decidim
         return permission_action unless permission_action.scope == :admin
 
         user_can_read_assembly_list?
+        user_can_list_assembly_list?
         user_can_read_current_assembly?
         user_can_create_assembly?
+        user_can_read_assemblies_setting?
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
@@ -165,6 +167,13 @@ module Decidim
         toggle_allow(user.admin?)
       end
 
+      def user_can_read_assemblies_setting?
+        return unless permission_action.action == :read &&
+                      permission_action.subject == :assemblies_setting
+
+        toggle_allow(user.admin?)
+      end
+
       # Everyone can read the assembly list
       def user_can_read_assembly_list?
         return unless read_assembly_list_permission_action?
@@ -172,6 +181,25 @@ module Decidim
         toggle_allow(user.admin? || has_manageable_assemblies?)
       end
 
+      # Checks whether the user can list the current given assembly or not.
+      #
+      # In case of user being admin of child assembly even parent assembly
+      # should be listed to be able to navigate to child assembly
+      def user_can_list_assembly_list?
+        return unless permission_action.action == :list &&
+                      permission_action.subject == :assembly
+
+        toggle_allow(user.admin? || allowed_list_of_assemblies?)
+      end
+
+      def allowed_list_of_assemblies?
+        assemblies = AssembliesWithUserRole.for(user)
+        parent_assemblies = assemblies.flat_map { |assembly| [assembly.id] + assembly.ancestors.pluck(:id) }
+
+        allowed_list_of_assemblies = Decidim::Assembly.where(id: assemblies + parent_assemblies)
+        allowed_list_of_assemblies.uniq.member?(assembly)
+      end
+
       def user_can_read_current_assembly?
         return unless read_assembly_list_permission_action?
         return if permission_action.subject == :assembly_list
@@ -239,7 +267,8 @@ module Decidim
           :assembly,
           :assembly_user_role,
           :assembly_member,
-          :space_private_user
+          :space_private_user,
+          :assemblies_setting
         ].include?(permission_action.subject)
         allow! if is_allowed
       end

data/app/presenters/decidim/assemblies/admin_log/assemblies_setting_presenter.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module AdminLog
+      # This class holds the logic to present a `Decidim::AssembliesSetting`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    AssembliesSettingPresenter.new(action_log, view_helpers).present
+      class AssembliesSettingPresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "update"
+            "decidim.admin_log.assembly_setting.#{action}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -38,7 +38,7 @@ module Decidim
 
       def render_stats_data(component_manifest, name, data, index)
         safe_join([
-                    index.zero? ? manifest_icon(component_manifest) : " /&nbsp".html_safe,
+                    index.zero? ? manifest_icon(component_manifest, role: "img", "aria-hidden": true) : " /&nbsp".html_safe,
                     content_tag(:span, "#{number_with_delimiter(data)} " + I18n.t(name, scope: "decidim.assemblies.statistics"),
                                 class: "#{name} process_stats-text")
                   ])

data/app/queries/decidim/assemblies/parent_assemblies_for_select.rb

@@ -15,8 +15,27 @@ module Decidim
         @assembly = assembly
       end
 
+      # Finds the available assemblies
+      #
+      # Returns an ActiveRecord::Relation.
       def query
-        Assembly.where(organization: @organization).where.not(id: @assembly)
+        available_assemblies = Assembly.where(organization: @organization).where.not(id: @assembly)
+
+        return available_assemblies if @assembly.blank?
+
+        available_assemblies.where.not(id: descendant_ids)
+      end
+
+      private
+
+      def descendant_ids
+        recursive_children(@assembly).flatten
+      end
+
+      def recursive_children(model)
+        model.children.map do |child|
+          [recursive_children(child), child.id]
+        end
       end
     end
   end

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

@@ -1,17 +1,19 @@
 <div id="assemblies-filter" class="inline-filters">
   <% if available_filters.any? %>
+    <div id="inline-filter-sort" class="dropdown-pane" data-position="bottom" data-alignment="right" data-dropdown data-auto-focus="true">
+      <ul class="list-reset">
+        <% available_filters.each do |title, id| %>
+          <li>
+          <%= link_to filter_link(id), remote: true do %>
+            <%= title %>
+          <% end %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
     <label>
       <span><%= help_text %></span>
       <button id="button-text" data-toggle="inline-filter-sort"><%= current_filter_name %></button>
-      <div id="inline-filter-sort" class="dropdown-pane" data-position="bottom" data-alignment="right" data-dropdown data-auto-focus="true">
-        <ul class="list-reset">
-          <% available_filters.each do |title, id| %>
-            <%= link_to filter_link(id), remote: true do %>
-              <li><%= title %></li>
-            <% end %>
-          <% end %>
-        </ul>
-      </div>
     </label>
   <% end %>
 </div>

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

@@ -38,11 +38,12 @@
         </thead>
         <tbody>
           <% @assemblies.each do |assembly| %>
+            <% next unless allowed_to? :list, :assembly, assembly: assembly %>
             <tr>
               <td>
                 <% if assembly.promoted? %>
                   <span data-tooltip class="icon-state icon-highlight" aria-haspopup="true" data-disable-hover="false" title="<%= t("models.assembly.fields.promoted", scope: "decidim.admin") %>">
-                    <%= icon "star" %>
+                    <%= icon "star", role: "img", "aria-hidden": true %>
                   </span>
                 <% end %>
                 <% if allowed_to? :update, :assembly, assembly: assembly %>
@@ -58,7 +59,7 @@
                 <% end %>
               </td>
               <td>
-                <%= l(assembly.created_at, format: :short) %>
+                <%= l(assembly.creation_date, format: :decidim_short) if assembly.creation_date %>
               </td>
               <td class="table-list__state">
                 <% if assembly.private_space? %>

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

@@ -0,0 +1,10 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".title") %></h2>
+  </div>
+  <div class="card-section">
+    <div class="row column">
+      <%= form.check_box :enable_organization_chart %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/assemblies/admin/assemblies_settings/edit.html.erb

@@ -0,0 +1,6 @@
+<%= decidim_form_for(@form, html: { class: "form edit_assemblies_settings" }, url: assemblies_settings_path, method: :put) do |f| %>
+  <%= render partial: "form", object: f %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t(".update") %>
+  </div>
+<% end %>

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

@@ -35,8 +35,8 @@
               <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
               <%= hidden_field_tag :status, @status %>
               <div class="input-group-button">
-                <button type="submit" class="button button--muted">
-                  <%= icon "magnifying-glass", aria_label: t(".search") %>
+                <button type="submit" class="button">
+                  <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
                 </button>
               </div>
             </div>

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

@@ -1,9 +1,9 @@
 <section id="parent-assemblies" class="section row collapse">
   <div class="row column">
     <div class="flex--sbe">
-      <h2 id="assemblies-count" class="section-heading collapse">
+      <h3 id="assemblies-count" class="section-heading collapse">
         <%= render partial: "count" %>
-      </h2>
+      </h3>
       <%= render partial: "decidim/assemblies/filter_by_type" %>
     </div>
     <hr class="reset mt-s mb-s">

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

@@ -1,4 +1,4 @@
-<article class="card card--full card--process">
+<div class="card card--full card--process">
   <div class="row collapse card--process__row">
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card__content">
@@ -6,7 +6,7 @@
           <h2 class="card__title"><%= translated_attribute promoted_assembly.title %></h2>
         <% end %>
         <%= decidim_sanitize html_truncate(translated_attribute(promoted_assembly.short_description), length: 630, separator: "...") %>
-        <%= link_to assembly_path(promoted_assembly), class: "button secondary small hollow card__button" do %>
+        <%= link_to assembly_path(promoted_assembly), class: "button small hollow card__button" do %>
           <%= t("assemblies.promoted_assembly.more_info", scope: "layouts.decidim") %>
         <% end %>
       </div>
@@ -24,4 +24,4 @@
       </div>
     </div>
   </div>
-</article>
+</div>

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

@@ -18,13 +18,16 @@ edit_link(
 
   <%= render partial: "parent_assemblies" %>
 
-  <section id="assemblies-chart" class="row column section">
-    <div class="row column">
-      <h2 class="section-heading"><%= t("assemblies.index.organizational_chart", scope: "layouts.decidim") %></h2>
-      <article id="orgchart-<%= SecureRandom.hex(5) %>" class="card orgchart js-orgchart absolutes" data-url="<%= decidim_assemblies.assemblies_path(format: :json) %>">
-        <button class="medium-1 m-s top left button small hollow invisible js-reset-orgchart"><%= t("assemblies.index.reset_chart", scope: "layouts.decidim") %></button>
-      </article>
-    </div>
-  </section>
+  <% if current_assemblies_settings.enable_organization_chart %>
+    <section id="assemblies-chart" class="row column section">
+      <div class="row column">
+        <h3 class="section-heading"><%= t("assemblies.index.organizational_chart", scope: "layouts.decidim") %></h3>
+        <div id="orgchart-<%= SecureRandom.hex(5) %>" class="card orgchart js-orgchart absolutes" data-url="<%= decidim_assemblies.assemblies_path(format: :json) %>">
+          <button class="medium-1 m-s top left button small hollow invisible js-reset-orgchart"><%= t("assemblies.index.reset_chart", scope: "layouts.decidim") %></button>
+        </div>
+      </div>
+    </section>
+  <% end %>
 <% end %>
 <%= javascript_include_tag "decidim/filters" %>
+<%= javascript_include_tag "decidim/assemblies/orgchart" %>

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

@@ -47,44 +47,45 @@ edit_link(
           translated_attribute(current_participatory_space.internal_organisation).present? ||
           translated_attribute(current_participatory_space.composition).present? %>
         <div class="show-more">
-          <button class="button button--muted small"><%= t("read_more", scope: "decidim.assemblies.show") %></button>
+          <button class="button hollow small"><%= t("read_more", scope: "decidim.assemblies.show") %></button>
         </div>
 
         <div class="hide show-more-panel">
           <% if translated_attribute(current_participatory_space.purpose_of_action).present? %>
             <div class="section">
-              <h4 class="section-heading"><%= t("purpose_of_action", scope: "decidim.assemblies.show") %></h4>
+              <h3 class="section-heading"><%= t("purpose_of_action", scope: "decidim.assemblies.show") %></h3>
               <%= decidim_sanitize translated_attribute(current_participatory_space.purpose_of_action) %>
             </div>
           <% end %>
 
           <% if translated_attribute(current_participatory_space.internal_organisation).present? %>
             <div class="section">
-              <h4 class="section-heading"><%= t("internal_organisation", scope: "decidim.assemblies.show") %></h4>
+              <h3 class="section-heading"><%= t("internal_organisation", scope: "decidim.assemblies.show") %></h3>
               <%= decidim_sanitize translated_attribute(current_participatory_space.internal_organisation) %>
             </div>
           <% end %>
 
           <% if translated_attribute(current_participatory_space.composition).present? %>
             <div class="section">
-              <h4 class="section-heading"><%= t("composition", scope: "decidim.assemblies.show") %></h4>
+              <h3 class="section-heading"><%= t("composition", scope: "decidim.assemblies.show") %></h3>
               <%= decidim_sanitize translated_attribute(current_participatory_space.composition) %>
             </div>
           <% end %>
           <div class="section text-center">
             <div class="hide-more">
-              <button class="button button--muted small"><%= t("read_less", scope: "decidim.assemblies.show") %></button>
+              <button class="button hollow small"><%= t("read_less", scope: "decidim.assemblies.show") %></button>
             </div>
           </div>
         </div>
       <% end %>
 
-      <%= render_hook(:current_participatory_space_meetings) %>
-
       <%= attachments_for current_participatory_space %>
+
+      <%= render_hook(:participatory_space_highlighted_elements) %>
+
       <% if current_participatory_space.children.visible_for(current_user).count.positive? %>
         <section id="assemblies-grid" class="section row collapse">
-          <h4 class="section-heading"><%= t("children", scope: "decidim.assemblies.show") %></h4>
+          <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">
             <%= render partial: "decidim/assemblies/assembly", collection: current_participatory_space.children.visible_for(current_user).published %>
           </div>

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

@@ -2,7 +2,7 @@
 
 <div class="section row column">
   <div class="flex--sbe">
-    <h2 class="section-heading"><%= t(".members") %> <span class="text-muted">(<%= collection.size %>)</span></h2>
+    <h3 class="section-heading"><%= t(".members") %> <span class="text-muted">(<%= collection.size %>)</span></h3>
   </div>
   <div id="assembly_members-grid" class="row small-up-1 medium-up-2 large-up-3 card-grid">
     <%= render(collection) %>

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

@@ -11,6 +11,11 @@
           <%= aria_selected_link_to I18n.t("menu.assemblies_types", scope: "decidim.admin"), decidim_admin_assemblies.assemblies_types_path %>
         </li>
       <% end %>
+      <% if allowed_to?(:read, :assemblies_setting) %>
+        <li <% if is_active_link?(decidim_admin_assemblies.edit_assemblies_settings_path) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to I18n.t("menu.assemblies_settings", scope: "decidim.admin"), decidim_admin_assemblies.edit_assemblies_settings_path %>
+        </li>
+      <% end %>
     </ul>
   </div>
 <% end %>

data/config/locales/bg-BG.yml

@@ -0,0 +1,7 @@
+bg:
+  activemodel:
+    attributes:
+      assembly:
+        area_id: Район
+        assembly_type: Тип събрание
+        assembly_type_other: Друг тип събрание

data/config/locales/ca.yml

@@ -101,6 +101,10 @@ ca:
         create:
           error: S'ha produït un error en duplicar aquesta assemblea.
           success: L'assemblea s'ha duplicat correctament.
+      assemblies_settings:
+        update:
+          error: Hi ha hagut un problema actualitzant la configuració.
+          success: Configuració actualitzada amb èxit.
       assemblies_types:
         create:
           error: S'ha produït un error en crear una nova assemblea.
@@ -161,6 +165,7 @@ ca:
           success: L'administradora s'ha actualitzat correctament per a aquesta assemblea.
       menu:
         assemblies: Assemblees
+        assemblies_settings: Configuració
         assemblies_submenu:
           assembly_admins: Administradores de l'assemblea
           assembly_members: Membres
@@ -222,6 +227,8 @@ ca:
         create: "%{user_name} ha afegit el membre %{resource_name} a l'assemblea %{space_name}"
         delete: "%{user_name} esborrat el membre %{resource_name} de l'assemblea %{space_name}"
         update: "%{user_name} ha actualitzat el membre %{resource_name} de l'assemblea %{space_name}"
+      assembly_setting:
+        update: "%{user_name} ha actualitzat la configuració de les assemblees"
       assembly_type:
         create: "%{user_name} ha creat l'assemblea %{resource_name}"
         delete: "%{user_name} ha eliminat el component %{resource_name} de l'espai %{space_name}"
@@ -251,6 +258,11 @@ ca:
             social_handlers: Social
             title: Informació general
             visbility: Visibilitat
+        assemblies_settings:
+          edit:
+            update: Actualitzar
+          form:
+            title: Configuració de les assemblees
         assemblies_types:
           form:
             title: Títol
@@ -310,6 +322,7 @@ ca:
         home:
           highlighted_assemblies:
             active_assemblies: Assemblees actives
+            assemblies_button_title: Enllaç a la pàgina d'Assemblees mostrant totes les assemblees
             see_all_assemblies: Veure totes les assemblees
         user_profile:
           member_of:
@@ -340,6 +353,7 @@ ca:
         related_participatory_processes: Processos participatius relacionats
         scope: Àmbit
         social_networks: Xarxes socials
+        social_networks_title: Compartir aquesta assemblea a
         target: Qui participa
       statistics:
         answers_count: Respostes
@@ -351,6 +365,7 @@ ca:
         meetings_count: Trobades
         orders_count: Suports
         pages_count: Pàgines
+        posts_count: Publicacions
         projects_count: Projectes
         proposals_count: Propostes
         results_count: Resultats
@@ -362,6 +377,24 @@ ca:
         designated_on: Designat a
       index:
         title: Membres
+    conferences:
+      pages:
+        home:
+          highlighted_conferences:
+            conferences_button_title: Enllaç a la pàgina de Jornades mostrant totes les jornades
+    events:
+      assemblies:
+        create_assembly_member:
+          email_intro: Una administradora de la assemblea <a href="%{resource_url}">%{resource_name}</a> t'ha afegit com a un dels seus membres.
+          email_outro: Reps aquesta notificació perquè t'han convidat a una assemblea. Entra en <a href="%{resource_path}">assembly page</a> per a contribuir-hi!
+          email_subject: T'han convidat a ser membre de l'assemblea %{resource_name}!
+          notification_title: T'han registrat com a membre de l'assemblea <a href="%{resource_path}">%{resource_name}</a>. Entra a <a href="%{resource_path}">assembly page</a> per a contribuir-hi!
+      assembly:
+        role_assigned:
+          email_intro: T'han assignat el rol de %{role} a l'assemblea "%{resource_title}".
+          email_outro: Reps aquesta notificació perquè se t'ha assignat el rol de %{role} a l'assemblea "%{resource_title}".
+          email_subject: Se t'ha assignat el rol de %{role} a "%{resource_title}".
+          notification_title: Se t'ha assignat el rol de %{role} a l'assemblea <a href="%{resource_url}">%{resource_title}</a>.
     help:
       participatory_spaces:
         assemblies:
@@ -381,6 +414,19 @@ ca:
         description: Nombre d'assemblees creades
         object: assemblees
         title: Assemblees
+    pages:
+      home:
+        hero:
+          participate_title: Participa als processos de la plataforma
+        sub_hero:
+          register_title: Registra't per crear un compte a la plataforma
+    participatory_processes:
+      pages:
+        home:
+          highlighted_processes:
+            processes_button_title: Enllaç a la pàgina de Processos mostrant tots els processos
+      show:
+        related_assemblies: Assemblees relacionades
   errors:
     messages:
       cannot_be_blank: no es pot estar en blanc