decidim-participatory_processes 0.10.1 → 0.11.0.pre1

data/config/locales/pt.yml

@@ -5,7 +5,7 @@ pt:
         announcement: Anúncio
         banner_image: Imagem da bandeira
         copy_categories: Cópiar categorias
-        copy_features: Recursos de cópia
+        copy_components: Copiar componentes
         copy_steps: Copie etapas
         description: Descrição
         developer_group: Grupo de desenvolvedores
@@ -66,15 +66,17 @@ pt:
           attachment_files: arquivos
           attachments: Anexos
           categories: Categorias
-          features: Características
+          components: Componentes
           info: Info
           moderations: Moderação
+          private_users: Usuários privados
           process_admins: Processar usuários
           steps: Passos
       models:
         participatory_process:
           fields:
             created_at: Criado em
+            private: Privado
             promoted: Em destaque
             published: Publicados
             title: Título
@@ -183,6 +185,8 @@ pt:
           title: Informação geral
         index:
           not_published: Não publicado
+          private: Privado
+          public: Público
           published: Publicados
         new:
           create: Criar
@@ -275,12 +279,14 @@ pt:
         local_area: Área de organização
         participatory_scope: O que é decidido
         participatory_structure: Como é decidido
+        private_space: Este é um processo privado
         scope: Âmbito
         start_date: Data de início
         target: Quem participa
       statistics:
         answers_count: Respostas
         comments_count: Comentários
+        debates_count: Debates
         endorsements_count: Endossos
         headline: Atividade
         meetings_count: Reuniões

data/config/locales/ru.yml

@@ -5,7 +5,6 @@ ru:
         announcement: Объявление
         banner_image: Изображение баннера
         copy_categories: Скопировать категории
-        copy_features: Копировать составляющие
         copy_steps: Копировать шаги
         description: Описание
         developer_group: Группа зачинателей
@@ -63,7 +62,6 @@ ru:
         participatory_processes_submenu:
           attachments: Вложения
           categories: Категории
-          features: Составляющие
           info: Информация
           moderations: Действия по модерации
           process_admins: Участники движения

data/config/locales/sv.yml

@@ -5,7 +5,7 @@ sv:
         announcement: Meddelande
         banner_image: Bannerbild
         copy_categories: Kopiera kategorier
-        copy_features: Kopiera funktioner
+        copy_components: Kopiera komponenter
         copy_steps: Kopiera steg
         description: Beskrivning
         developer_group: Utvecklargrupp
@@ -66,15 +66,17 @@ sv:
           attachment_files: Filer
           attachments: Bifogade filer
           categories: Kategorier
-          features: Funktioner
+          components: Komponenter
           info: Info
           moderations: Moderering
+          private_users: Privata användare
           process_admins: Processanvändare
           steps: Steg
       models:
         participatory_process:
           fields:
             created_at: Skapad vid
+            private: Privat
             promoted: Markerad
             published: Publicerad
             title: Titel
@@ -183,6 +185,8 @@ sv:
           title: Allmän information
         index:
           not_published: Ej publicerad
+          private: Privat
+          public: Offentlig
           published: Publicerad
         new:
           create: Skapa
@@ -275,12 +279,14 @@ sv:
         local_area: Organisationsområde
         participatory_scope: Vad bestäms
         participatory_structure: Hur bestäms det
+        private_space: Detta är en privat process
         scope: Omfattning
         start_date: Startdatum
         target: Vem deltar
       statistics:
         answers_count: Svar
         comments_count: Kommentarer
+        debates_count: Debatter
         endorsements_count: påskrifter
         headline: Aktivitet
         meetings_count: Möten

data/config/locales/uk.yml

@@ -5,7 +5,6 @@ uk:
         announcement: Оголошення
         banner_image: Банерне зображення
         copy_categories: Скопіювати розділи
-        copy_features: Скопіювати складові
         copy_steps: Скопіювати кроки
         description: Опис
         developer_group: Група зачинальників
@@ -66,7 +65,6 @@ uk:
           attachment_files: Файли
           attachments: Вкладені файли
           categories: Розділи
-          features: Складова
           info: Інформація
           moderations: Дії з модерації
           process_admins: Учасники руху

data/db/migrate/20170720120135_make_features_polymorphic.rb

@@ -2,26 +2,26 @@
 
 class MakeFeaturesPolymorphic < ActiveRecord::Migration[5.1]
   def change
-    remove_index :decidim_features, name: "index_decidim_features_on_decidim_participatory_process_id"
+    remove_index :decidim_components, name: "index_decidim_components_on_decidim_participatory_process_id"
 
-    add_column :decidim_features, :participatory_space_type, :string
+    add_column :decidim_components, :participatory_space_type, :string
 
     reversible do |direction|
       direction.up do
         execute <<~SQL.squish
-          UPDATE decidim_features
+          UPDATE decidim_components
           SET participatory_space_type = 'Decidim::ParticipatoryProcess'
         SQL
       end
     end
 
-    rename_column :decidim_features, :decidim_participatory_process_id, :participatory_space_id
+    rename_column :decidim_components, :decidim_participatory_process_id, :participatory_space_id
 
-    add_index :decidim_features,
+    add_index :decidim_components,
               [:participatory_space_id, :participatory_space_type],
-              name: "index_decidim_features_on_decidim_participatory_space"
+              name: "index_decidim_components_on_decidim_participatory_space"
 
-    change_column_null :decidim_features, :participatory_space_id, false
-    change_column_null :decidim_features, :participatory_space_type, false
+    change_column_null :decidim_components, :participatory_space_id, false
+    change_column_null :decidim_components, :participatory_space_type, false
   end
 end

data/db/migrate/20180122110007_add_private_to_participatory_processes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddPrivateToParticipatoryProcesses < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_participatory_processes, :private_space, :boolean, default: false
+  end
+end

data/lib/decidim/participatory_processes/admin_engine.rb

@@ -37,8 +37,8 @@ module Decidim
         scope "/participatory_processes/:participatory_process_slug" do
           resources :categories
 
-          resources :features do
-            resource :permissions, controller: "feature_permissions"
+          resources :components do
+            resource :permissions, controller: "component_permissions"
             member do
               put :publish
               put :unpublish
@@ -52,13 +52,18 @@ module Decidim
               put :hide
             end
           end
+          resources :participatory_space_private_users, controller: "participatory_space_private_users" do
+            member do
+              post :resend_invitation, to: "participatory_space_private_users#resend_invitation"
+            end
+          end
         end
 
-        scope "/participatory_processes/:participatory_process_slug/features/:feature_id/manage" do
-          Decidim.feature_manifests.each do |manifest|
+        scope "/participatory_processes/:participatory_process_slug/components/:component_id/manage" do
+          Decidim.component_manifests.each do |manifest|
             next unless manifest.admin_engine
 
-            constraints CurrentFeature.new(manifest) do
+            constraints CurrentComponent.new(manifest) do
               mount manifest.admin_engine, at: "/", as: "decidim_admin_participatory_process_#{manifest.name}"
             end
           end

data/lib/decidim/participatory_processes/engine.rb

@@ -17,9 +17,9 @@ module Decidim
           process ? "/processes/#{process.slug}" : "/404"
         }, constraints: { process_id: /[0-9]+/ }
 
-        get "/processes/:process_id/f/:feature_id", to: redirect { |params, _request|
+        get "/processes/:process_id/f/:component_id", to: redirect { |params, _request|
           process = Decidim::ParticipatoryProcess.find(params[:process_id])
-          process ? "/processes/#{process.slug}/f/#{params[:feature_id]}" : "/404"
+          process ? "/processes/#{process.slug}/f/#{params[:component_id]}" : "/404"
         }, constraints: { process_id: /[0-9]+/ }
 
         resources :participatory_process_groups, only: :show, path: "processes_groups"
@@ -28,11 +28,11 @@ module Decidim
           resource :participatory_process_widget, only: :show, path: "embed"
         end
 
-        scope "/processes/:participatory_process_slug/f/:feature_id" do
-          Decidim.feature_manifests.each do |manifest|
+        scope "/processes/:participatory_process_slug/f/:component_id" do
+          Decidim.component_manifests.each do |manifest|
             next unless manifest.engine
 
-            constraints CurrentFeature.new(manifest) do
+            constraints CurrentComponent.new(manifest) do
               mount manifest.engine, at: "/", as: "decidim_participatory_process_#{manifest.name}"
             end
           end
@@ -65,7 +65,7 @@ module Decidim
       initializer "decidim_participatory_processes.view_hooks" do
         Decidim.view_hooks.register(:highlighted_elements, priority: Decidim::ViewHooks::HIGH_PRIORITY) do |view_context|
           highlighted_processes =
-            OrganizationPublishedParticipatoryProcesses.new(view_context.current_organization) |
+            OrganizationPublishedParticipatoryProcesses.new(view_context.current_organization, view_context.current_user) |
             HighlightedParticipatoryProcesses.new |
             FilteredParticipatoryProcesses.new("active")
 

data/lib/decidim/participatory_processes/participatory_space.rb

@@ -139,7 +139,7 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
         )
       end
 
-      Decidim.feature_manifests.each do |manifest|
+      Decidim.component_manifests.each do |manifest|
         manifest.seed!(process.reload)
       end
     end

data/lib/decidim/participatory_processes/test/factories.rb

@@ -27,8 +27,9 @@ FactoryBot.define do
     participatory_scope { Decidim::Faker::Localized.sentence(1) }
     participatory_structure { Decidim::Faker::Localized.sentence(2) }
     show_statistics true
+    private_space false
     start_date { Time.current }
-    end_date 2.months.from_now.at_midnight
+    end_date { 2.months.from_now.at_midnight }
 
     trait :promoted do
       promoted true
@@ -82,8 +83,8 @@ FactoryBot.define do
   factory :participatory_process_step, class: "Decidim::ParticipatoryProcessStep" do
     title { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
-    start_date 1.month.ago.at_midnight
-    end_date 2.months.from_now.at_midnight
+    start_date { 1.month.ago.at_midnight }
+    end_date { 2.months.from_now.at_midnight }
     position nil
     participatory_process
 

data/lib/decidim/participatory_processes/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-participatory_processes version.
   module ParticipatoryProcesses
     def self.version
-      "0.10.1"
+      "0.11.0.pre1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-participatory_processes
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0.pre1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-04-26 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.10.1
+        version: 0.11.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 description: Participatory processes component for decidim.
 email:
 - josepjaume@gmail.com
@@ -85,14 +85,14 @@ files:
 - app/commands/decidim/participatory_processes/admin/update_participatory_process_admin.rb
 - app/commands/decidim/participatory_processes/admin/update_participatory_process_group.rb
 - app/commands/decidim/participatory_processes/admin/update_participatory_process_step.rb
-- app/constraints/decidim/participatory_processes/current_feature.rb
+- app/constraints/decidim/participatory_processes/current_component.rb
 - app/constraints/decidim/participatory_processes/current_participatory_process.rb
 - app/controllers/decidim/participatory_processes/admin/application_controller.rb
 - app/controllers/decidim/participatory_processes/admin/categories_controller.rb
+- app/controllers/decidim/participatory_processes/admin/component_permissions_controller.rb
+- app/controllers/decidim/participatory_processes/admin/components_controller.rb
 - app/controllers/decidim/participatory_processes/admin/concerns/participatory_process_admin.rb
 - app/controllers/decidim/participatory_processes/admin/exports_controller.rb
-- app/controllers/decidim/participatory_processes/admin/feature_permissions_controller.rb
-- app/controllers/decidim/participatory_processes/admin/features_controller.rb
 - app/controllers/decidim/participatory_processes/admin/moderations_controller.rb
 - app/controllers/decidim/participatory_processes/admin/participatory_process_attachment_collections_controller.rb
 - app/controllers/decidim/participatory_processes/admin/participatory_process_attachments_controller.rb
@@ -104,6 +104,7 @@ files:
 - app/controllers/decidim/participatory_processes/admin/participatory_process_steps_controller.rb
 - app/controllers/decidim/participatory_processes/admin/participatory_process_user_roles_controller.rb
 - app/controllers/decidim/participatory_processes/admin/participatory_processes_controller.rb
+- app/controllers/decidim/participatory_processes/admin/participatory_space_private_users_controller.rb
 - app/controllers/decidim/participatory_processes/application_controller.rb
 - app/controllers/decidim/participatory_processes/participatory_process_groups_controller.rb
 - app/controllers/decidim/participatory_processes/participatory_process_steps_controller.rb
@@ -142,6 +143,7 @@ files:
 - app/queries/decidim/participatory_processes/prioritized_participatory_processes.rb
 - app/queries/decidim/participatory_processes/promoted_participatory_processes.rb
 - app/queries/decidim/participatory_processes/published_participatory_processes.rb
+- app/queries/decidim/participatory_processes/visible_participatory_processes.rb
 - app/types/decidim/participatory_processes/participatory_process_step_type.rb
 - app/types/decidim/participatory_processes/participatory_process_type.rb
 - app/views/decidim/participatory_process_groups/_participatory_process_group.html.erb
@@ -228,6 +230,7 @@ files:
 - db/migrate/20170830081725_add_start_date_to_processes.rb
 - db/migrate/20171215081244_add_weight_to_attachments.rb
 - db/migrate/20171215141722_add_attachment_collection_to_attachments.rb
+- db/migrate/20180122110007_add_private_to_participatory_processes.rb
 - db/migrate/20180125102537_add_reference_to_processes.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
@@ -255,9 +258,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3