decidim-core 0.4.3 → 0.4.4

data/app/presenters/decidim/resource_locator_presenter.rb

@@ -2,47 +2,89 @@
 
 module Decidim
   # A presenter to get the url or path from a resource.
-  class ResourceLocatorPresenter < Rectify::Presenter
+  class ResourceLocatorPresenter
     def initialize(resource)
       @resource = resource
     end
 
-    # Builds the path to a resource. Useful when linking to a resource from
+    # Builds the path to the resource. Useful when linking to a resource from
     # another engine.
     #
     # options - An optional hash of options to pass to the Rails router
     #
     # Returns a String.
     def path(options = {})
-      _route(@resource, "path", options)
+      member_route("path", options)
     end
 
-    # Builds the url to a resource. Useful when linking to a resource from
+    # Builds the url to the resource. Useful when linking to a resource from
     # another engine.
     #
     # options - An optional hash of options to pass to the Rails router
     #
     # Returns a String.
     def url(options = {})
-      _route(@resource, "url", options.merge(host: @resource.organization.host))
+      member_route("url", options.merge(host: @resource.organization.host))
+    end
+
+    # Builds the index path to the associated collection of resources.
+    #
+    # options - An optional hash of options to pass to the Rails router
+    #
+    # Returns a String.
+    def index(options = {})
+      collection_route("path", options)
     end
 
     private
 
-    # Private: Build the route to a given resource.
+    # Private: Build the route to the resource.
     #
     # Returns a String.
-    def _route(resource, route_type, options)
-      manifest = resource.class.resource_manifest
-      engine = manifest.feature_manifest.engine
-
-      url_params = {
-        id: resource.id,
-        feature_id: resource.feature.id,
-        participatory_process_id: resource.feature.participatory_process.id
+    def member_route(route_type, options)
+      route_proxy.send("#{member_route_name}_#{route_type}", member_params.merge(options))
+    end
+
+    # Private: Build the route to the associated collection of resources.
+    #
+    # Returns a String.
+    def collection_route(route_type, options)
+      route_proxy.send("#{collection_route_name}_#{route_type}", collection_params.merge(options))
+    end
+
+    def manifest
+      @resource.class.resource_manifest
+    end
+
+    def feature
+      @resource.feature
+    end
+
+    def engine
+      manifest.feature_manifest.engine
+    end
+
+    def member_params
+      collection_params.merge(id: @resource.id)
+    end
+
+    def collection_params
+      {
+        feature_id: feature.id,
+        participatory_process_id: feature.participatory_process.id
       }
+    end
+
+    def member_route_name
+      manifest.route_name
+    end
+
+    def collection_route_name
+      member_route_name.pluralize
+    end
 
-      engine.routes.url_helpers.send("#{manifest.route_name}_#{route_type}", url_params.merge(options))
+    def route_proxy
+      @route_proxy ||= engine.routes.url_helpers
     end
   end
 end

data/app/queries/decidim/highlighted_participatory_processes.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This query adds some scopes so the processes are ready to be showed in a
-  # public view.
+  # This query selects some prioritized processes.
   class HighlightedParticipatoryProcesses < Rectify::Query
     def query
       PrioritizedParticipatoryProcesses.new.query.limit(8)

data/app/queries/decidim/organization_participatory_process_groups.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This query class filters participatory process groups given an organization.
+  class OrganizationParticipatoryProcessGroups < Rectify::Query
+    def initialize(organization)
+      @organization = organization
+    end
+
+    def query
+      ParticipatoryProcessGroup.where(organization: @organization)
+    end
+  end
+end

data/app/queries/decidim/organization_participatory_processes.rb

@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This query class returns the visible Participatory Processes given an
-  # Organization.
+  # This query class filters all processes given an organization.
   class OrganizationParticipatoryProcesses < Rectify::Query
     def initialize(organization)
       @organization = organization
     end
 
     def query
-      raise MandatoryOrganization unless @organization
-      ParticipatoryProcess.where(organization: @organization).published
+      ParticipatoryProcess.where(organization: @organization)
     end
-
-    class MandatoryOrganization < StandardError; end
   end
 end

data/app/queries/decidim/organization_prioritized_participatory_processes.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This query class returns the public Participatory Processes given an
-  # Organization in a meaningful order.
+  # This query class filters public processes given an organization in a
+  # meaningful prioritized order.
   class OrganizationPrioritizedParticipatoryProcesses < Rectify::Query
     def initialize(organization)
       @organization = organization
@@ -10,7 +10,7 @@ module Decidim
 
     def query
       Rectify::Query.merge(
-        OrganizationParticipatoryProcesses.new(@organization),
+        OrganizationPublishedParticipatoryProcesses.new(@organization),
         PrioritizedParticipatoryProcesses.new
       ).query
     end

data/app/queries/decidim/organization_published_participatory_processes.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This query class filters published processes given an organization.
+  class OrganizationPublishedParticipatoryProcesses < Rectify::Query
+    def initialize(organization)
+      @organization = organization
+    end
+
+    def query
+      Rectify::Query.merge(
+        OrganizationParticipatoryProcesses.new(@organization),
+        PublishedParticipatoryProcesses.new
+      ).query
+    end
+  end
+end

data/app/queries/decidim/participatory_processes_with_user_role.rb

@@ -28,7 +28,7 @@ module Decidim
     # Returns an ActiveRecord::Relation.
     def query
       # Admin users have all role privileges for all organization processes
-      return user.organization.participatory_processes if user.admin?
+      return OrganizationParticipatoryProcesses.new(user.organization).query if user.admin?
 
       ParticipatoryProcess.where(id: process_ids)
     end

data/app/queries/decidim/prioritized_participatory_processes.rb

@@ -5,7 +5,7 @@ module Decidim
   # first, and closest to finalization date second.
   class PrioritizedParticipatoryProcesses < Rectify::Query
     def query
-      Decidim::ParticipatoryProcess.order("promoted DESC").includes(:active_step).order("decidim_participatory_process_steps.end_date ASC")
+      Decidim::ParticipatoryProcess.order(promoted: :desc).includes(:active_step).order("decidim_participatory_process_steps.end_date ASC")
     end
   end
 end

data/app/queries/decidim/published_participatory_processes.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This query filters published processes only.
+  class PublishedParticipatoryProcesses < Rectify::Query
+    def query
+      ParticipatoryProcess.published
+    end
+  end
+end

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

@@ -48,8 +48,8 @@
 
             <% current_participatory_process.features.each do |feature| %>
               <% if feature.published? || feature == self.try(:current_feature) %>
-                <li class="<%= "is-active" if is_active_link?(feature_path(feature), :inclusive) %>">
-                  <%= active_link_to feature_path(feature), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>
+                <li class="<%= "is-active" if is_active_link?(main_feature_path(feature), :inclusive) %>">
+                  <%= active_link_to main_feature_path(feature), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>
                     <%= feature_icon(feature) %>
 
                     <%= translated_attribute(feature.name) %>

data/config/locales/ca.yml

@@ -205,6 +205,20 @@ ca:
         participatory_structure: Estructura participativa
         scope: Àmbit
         target: A qui va dirigit?
+      statistics:
+        answers_count: Respostes
+        comments_count: Comentaris
+        headline: Activitat
+        meetings_count: Trobades
+        orders_count: Vots
+        pages_count: Pàgines
+        processes_count: Processos
+        projects_count: Projectes
+        proposals_count: Propostes
+        results_count: Resultats
+        surveys_count: Enquestes
+        users_count: Participants
+        votes_count: Suports
     reported_mailer:
       hide:
         hello: Hola %{name},
@@ -382,12 +396,17 @@ ca:
         active_step: Fase activa
         see_all_processes: Veure tots els processos
       statistics:
+        answers_count: Respostes
         comments_count: Comentaris
         headline: Estat actual de %{organization}
         meetings_count: Trobades
+        orders_count: Vots
+        pages_count: Pàgines
         processes_count: Processos
+        projects_count: Projectes
         proposals_count: Propostes
         results_count: Resultats
+        surveys_count: Enquestes
         users_count: Participants
         votes_count: Suports
       sub_hero:

data/config/locales/es.yml

@@ -205,6 +205,20 @@ es:
         participatory_structure: Estructura participativa
         scope: Ámbito
         target: '¿A quién va dirigido?'
+      statistics:
+        answers_count: Respuestas
+        comments_count: Comentarios
+        headline: Actividad
+        meetings_count: Encuentros
+        orders_count: Votos
+        pages_count: Páginas
+        processes_count: Procesos
+        projects_count: Proyectos
+        proposals_count: Propuestas
+        results_count: Resultados
+        surveys_count: Encuestas
+        users_count: Participantes
+        votes_count: Soportes
     reported_mailer:
       hide:
         hello: Hola %{name},
@@ -382,12 +396,17 @@ es:
         active_step: Fase activa
         see_all_processes: Ver todos los procesos
       statistics:
+        answers_count: Respuestas
         comments_count: Comentarios
         headline: Estado actual de %{organization}
         meetings_count: Encuentros
+        orders_count: Votos
+        pages_count: Páginas
         processes_count: Procesos
+        projects_count: Proyectos
         proposals_count: Propuestas
         results_count: Resultados
+        surveys_count: Encuestas
         users_count: Participantes
         votes_count: Votos
       sub_hero:

data/config/locales/fr.yml

@@ -86,7 +86,7 @@ fr:
       registrations:
         new:
           already_have_an_account?: Vous avez déjà un compte?
-          newsletter_notifications: Recevoir des lettres d'informations sur l'activité de la plateforme 
+          newsletter_notifications: Recevoir des lettres d'informations sur l'activité de la plateforme
           sign_in: S'identifier
           sign_up: S'inscrire
           sign_up_as:
@@ -380,4 +380,4 @@ fr:
       last: Dernière »
       next: Suivant ›
       previous: "‹ Précédent"
-      truncate: "…"
+      truncate: "…"

data/db/migrate/20170608142521_add_organization_to_user_groups.rb

@@ -1,12 +1,25 @@
 # frozen_string_literal: true
 
 class AddOrganizationToUserGroups < ActiveRecord::Migration[5.0]
+  class UserGroup < ApplicationRecord
+    self.table_name = :decidim_user_groups
+  end
+
   def change
     add_column :decidim_user_groups, :decidim_organization_id, :integer
 
-    Decidim::UserGroup.includes(:users).find_each do |user_group|
-      user_group.organization = user_group.users.first.organization
-      user_group.save!(validate: false)
+    UserGroup.find_each do |user_group|
+      execute <<~SQL.squish
+        UPDATE decidim_user_groups
+        SET decidim_organization_id = (
+          SELECT MIN(u.decidim_organization_id)
+          FROM decidim_users u
+          INNER JOIN decidim_user_group_memberships m
+          ON u.id = m.decidim_user_id
+          WHERE m.decidim_user_group_id = #{user_group.id}
+        )
+        WHERE id = #{user_group.id}
+      SQL
     end
 
     change_column :decidim_user_groups, :decidim_organization_id, :integer, null: false

data/db/seeds.rb

@@ -17,7 +17,7 @@ if !Rails.env.production? || ENV["SEED"]
     end,
     homepage_image: File.new(File.join(__dir__, "seeds", "homepage_image.jpg")),
     default_locale: I18n.default_locale,
-    available_locales: Decidim.available_locales,
+    available_locales: [:en, :ca, :es],
     reference_prefix: Faker::Name.suffix
   )
 
@@ -28,9 +28,8 @@ if !Rails.env.production? || ENV["SEED"]
     )
   end
 
-  Decidim::User.create!(
+  Decidim::User.find_or_initialize_by(email: "admin@example.org").update!(
     name: Faker::Name.name,
-    email: "admin@example.org",
     password: "decidim123456",
     password_confirmation: "decidim123456",
     organization: organization,
@@ -42,9 +41,8 @@ if !Rails.env.production? || ENV["SEED"]
     replies_notifications: true
   )
 
-  Decidim::User.create!(
+  Decidim::User.find_or_initialize_by(email: "user@example.org").update!(
     name: Faker::Name.name,
-    email: "user@example.org",
     password: "decidim123456",
     password_confirmation: "decidim123456",
     confirmed_at: Time.current,
@@ -115,22 +113,25 @@ if !Rails.env.production? || ENV["SEED"]
   end
 
   Decidim::ParticipatoryProcess.find_each do |process|
-    Decidim::ParticipatoryProcessStep.create!(
+    Decidim::ParticipatoryProcessStep.find_or_initialize_by(
+      participatory_process: process,
+      active: true
+    ).update!(
       title: Decidim::Faker::Localized.sentence(1, false, 2),
       description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
         Decidim::Faker::Localized.paragraph(3)
       end,
-      active: true,
       start_date: 1.month.ago.at_midnight,
-      end_date: 2.months.from_now.at_midnight,
-      participatory_process: process
+      end_date: 2.months.from_now.at_midnight
     )
 
     # Create users with specific roles
     Decidim::ParticipatoryProcessUserRole::ROLES.each do |role|
-      user = Decidim::User.create!(
+      email = "participatory_process_#{process.id}_#{role}@example.org"
+
+      user = Decidim::User.find_or_initialize_by(email: email)
+      user.update!(
         name: Faker::Name.name,
-        email: "participatory_process_#{process.id}_#{role}@example.org",
         password: "decidim123456",
         password_confirmation: "decidim123456",
         organization: organization,
@@ -141,7 +142,11 @@ if !Rails.env.production? || ENV["SEED"]
         replies_notifications: true
       )
 
-      Decidim::ParticipatoryProcessUserRole.create!(user: user, participatory_process: process, role: role)
+      Decidim::ParticipatoryProcessUserRole.find_or_create_by!(
+        user: user,
+        participatory_process: process,
+        role: role
+      )
     end
 
     Decidim::Attachment.create!(

data/lib/decidim/abilities.rb

@@ -2,10 +2,6 @@
 
 module Decidim
   module Abilities
-    autoload :AdminAbility, "decidim/abilities/admin_ability"
     autoload :ParticipatoryProcessRoleAbility, "decidim/abilities/participatory_process_role_ability"
-    autoload :ParticipatoryProcessAdminAbility, "decidim/abilities/participatory_process_admin_ability"
-    autoload :ParticipatoryProcessCollaboratorAbility, "decidim/abilities/participatory_process_collaborator_ability"
-    autoload :ParticipatoryProcessModeratorAbility, "decidim/abilities/participatory_process_moderator_ability"
   end
 end