decidim-participatory_processes 0.11.2 → 0.12.0.pre

data/config/locales/sv.yml

@@ -44,6 +44,20 @@ sv:
         email: E-post
         name: namn
         role: Roll
+    models:
+      decidim/participatory_process_step_activated_event: Steg aktiverat
+      decidim/participatory_process_step_changed_event: Steget ändrats
+  activerecord:
+    models:
+      decidim/participatory_process:
+        one: Deltagande process
+        other: Deltagande processer
+      decidim/participatory_process_group:
+        one: Deltagande processgrupp
+        other: Deltagande processgrupper
+      decidim/participatory_process_step:
+        one: Steg
+        other: Steg
   decidim:
     admin:
       actions:
@@ -283,6 +297,7 @@ sv:
         scope: Omfattning
         start_date: Startdatum
         target: Vem deltar
+        unspecified: Ej angivet
       statistics:
         answers_count: Svar
         comments_count: Kommentarer
@@ -304,6 +319,7 @@ sv:
       participatory_process_groups:
         participatory_process_group:
           browse: Bläddra
+          processes_count: 'processer:'
       participatory_process_widgets:
         show:
           active_step: Aktivt steg

data/config/locales/uk.yml

@@ -44,6 +44,26 @@ uk:
         email: Адреса електронної пошти
         name: Ім'я
         role: Роль
+    models:
+      decidim/participatory_process_step_activated_event: Крок започато
+      decidim/participatory_process_step_changed_event: Крок змінено
+  activerecord:
+    models:
+      decidim/participatory_process:
+        one: Рух співучасті
+        few: Рухи співучасті
+        many: Рухів співучасті
+        other: Рухів співучасті
+      decidim/participatory_process_group:
+        one: Гурт руху співучасті
+        few: Гурти руху співучасті
+        many: Гуртів руху співучасті
+        other: Гуртів руху співучасті
+      decidim/participatory_process_step:
+        one: Крок
+        few: Кроки
+        many: Кроків
+        other: Кроків
   decidim:
     admin:
       actions:
@@ -186,7 +206,7 @@ uk:
         index:
           not_published: Не оприлюднено
           private: Приватний
-          public: Публічні
+          public: Оприлюдені
           published: Оприлюднено
         new:
           create: Створити
@@ -232,7 +252,7 @@ uk:
           email_subject: Оновлення до %{participatory_space_title}
           notification_title: Приведено в дію крок %{resource_title} простору співучасті <a href="%{resource_path}">%{participatory_space_title}</a>
         step_changed:
-          email_intro: 'Дати для кроку %{resource_title} в %{participatory_space_title} оновлено. Ви можете побачити це на сторінці:'
+          email_intro: 'Дати для кроку %{resource_title} в %{participatory_space_title} оновлено. Ви можете переглянути їх на сторінці:'
           email_outro: Ви отримали це сповіщення, тому що ви стежите за %{participatory_space_title}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
           email_subject: Оновлення до %{participatory_space_title}
           notification_title: Дати для кроку <a href="%{resource_path}">%{resource_title}</a> у <a href="%{participatory_space_url}">%{participatory_space_title}</a> були оновлені.
@@ -283,6 +303,7 @@ uk:
         scope: Обсяг
         start_date: Дата початку
         target: Хто бере участь
+        unspecified: Не вказано
       statistics:
         answers_count: Відповіді
         comments_count: Коментарі
@@ -304,6 +325,7 @@ uk:
       participatory_process_groups:
         participatory_process_group:
           browse: Огляд
+          processes_count: 'Рухи:'
       participatory_process_widgets:
         show:
           active_step: Діючий крок

data/lib/decidim/participatory_processes/admin_engine.rb

@@ -74,14 +74,6 @@ module Decidim
         app.config.assets.precompile += %w(admin/decidim_participatory_processes_manifest.js)
       end
 
-      initializer "decidim_participatory_processes.inject_abilities_to_user" do |_app|
-        Decidim.configure do |config|
-          config.admin_abilities += [
-            "Decidim::ParticipatoryProcesses::Abilities::Admin::AdminAbility"
-          ]
-        end
-      end
-
       initializer "decidim_participatory_processes.admin_menu" do
         Decidim.menu :admin_menu do |menu|
           menu.item I18n.t("menu.participatory_processes", scope: "decidim.admin"),
@@ -89,14 +81,14 @@ module Decidim
                     icon_name: "target",
                     position: 2,
                     active: :inclusive,
-                    if: can?(:read, Decidim::ParticipatoryProcess)
+                    if: allowed_to?(:enter, :space_area, space_name: :processes)
 
           menu.item I18n.t("menu.participatory_process_groups", scope: "decidim.admin"),
                     decidim_admin_participatory_processes.participatory_process_groups_path,
                     icon_name: "layers",
                     position: 3,
                     active: :inclusive,
-                    if: can?(:read, Decidim::ParticipatoryProcessGroup)
+                    if: allowed_to?(:enter, :space_area, space_name: :process_groups)
         end
       end
     end

data/lib/decidim/participatory_processes/engine.rb

@@ -43,13 +43,9 @@ module Decidim
         app.config.assets.precompile += %w(decidim_participatory_processes_manifest.js)
       end
 
-      initializer "decidim_participatory_processes.inject_abilities_to_user" do |_app|
-        Decidim.configure do |config|
-          config.abilities += [
-            "Decidim::ParticipatoryProcesses::Abilities::EveryoneAbility",
-            "Decidim::ParticipatoryProcesses::Abilities::AdminAbility"
-          ]
-        end
+      initializer "decidim_participatory_processes.add_cells_view_paths" do
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::ParticipatoryProcesses::Engine.root}/app/cells")
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::ParticipatoryProcesses::Engine.root}/app/views") # for partials
       end
 
       initializer "decidim_participatory_processes.menu" do

data/lib/decidim/participatory_processes/participatory_space.rb

@@ -10,6 +10,18 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
 
   participatory_space.query_type = "Decidim::ParticipatoryProcesses::ParticipatoryProcessType"
 
+  participatory_space.permissions_class_name = "Decidim::ParticipatoryProcesses::Permissions"
+
+  participatory_space.register_resource(:participatory_process) do |resource|
+    resource.model_class_name = "Decidim::ParticipatoryProcess"
+    resource.card = "decidim/participatory_processes/process"
+  end
+
+  participatory_space.register_resource(:participatory_process_group) do |resource|
+    resource.model_class_name = "Decidim::ParticipatoryProcessGroup"
+    resource.card = "decidim/participatory_processes/process_group"
+  end
+
   participatory_space.context(:public) do |context|
     context.engine = Decidim::ParticipatoryProcesses::Engine
     context.layout = "layouts/decidim/participatory_process"
@@ -63,7 +75,7 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
         start_date: Time.current,
         end_date: 2.months.from_now.at_midnight,
         participatory_process_group: process_groups.sample,
-        scope: n.positive? ? nil : Decidim::Scope.reorder("RANDOM()").first
+        scope: n.positive? ? nil : Decidim::Scope.reorder(Arel.sql("RANDOM()")).first
       )
 
       Decidim::ParticipatoryProcessStep.find_or_initialize_by(

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.11.2"
+      "0.12.0.pre"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-participatory_processes
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.pre
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-06 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.11.2
+        version: 0.12.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0.pre
 description: Participatory processes component for decidim.
 email:
 - josepjaume@gmail.com
@@ -70,6 +70,14 @@ files:
 - app/assets/images/decidim/participatory_processes/process.svg
 - app/assets/javascripts/decidim/participatory_processes/admin/participatory_processes.js.es6
 - app/assets/javascripts/decidim/participatory_processes/filters.js.es6
+- app/cells/decidim/participatory_processes/process_cell.rb
+- app/cells/decidim/participatory_processes/process_group_cell.rb
+- app/cells/decidim/participatory_processes/process_group_m/footer.erb
+- app/cells/decidim/participatory_processes/process_group_m_cell.rb
+- app/cells/decidim/participatory_processes/process_m/data.erb
+- app/cells/decidim/participatory_processes/process_m/footer.erb
+- app/cells/decidim/participatory_processes/process_m/tags.erb
+- app/cells/decidim/participatory_processes/process_m_cell.rb
 - app/commands/decidim/participatory_processes/admin/activate_participatory_process_step.rb
 - app/commands/decidim/participatory_processes/admin/copy_participatory_process.rb
 - app/commands/decidim/participatory_processes/admin/create_participatory_process.rb
@@ -123,9 +131,7 @@ files:
 - app/models/decidim/participatory_process.rb
 - app/models/decidim/participatory_process_group.rb
 - app/models/decidim/participatory_process_step.rb
-- app/models/decidim/participatory_processes/abilities/admin/admin_ability.rb
-- app/models/decidim/participatory_processes/abilities/admin_ability.rb
-- app/models/decidim/participatory_processes/abilities/everyone_ability.rb
+- app/permissions/decidim/participatory_processes/permissions.rb
 - app/presenters/decidim/participatory_processes/admin_log/participatory_process_presenter.rb
 - app/presenters/decidim/participatory_processes/admin_log/participatory_process_user_role_presenter.rb
 - app/presenters/decidim/participatory_processes/admin_log/step_presenter.rb
@@ -258,9 +264,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.6

data/app/models/decidim/participatory_processes/abilities/admin/admin_ability.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    module Abilities
-      module Admin
-        # Defines the abilities for a user in the admin section. Intended to be
-        # used with `cancancan`.
-        class AdminAbility < Decidim::Abilities::AdminAbility
-          def define_abilities
-            super
-
-            can :manage, ParticipatoryProcess
-            can :manage, ParticipatoryProcessGroup
-            can :manage, ParticipatoryProcessStep
-            can :manage, Decidim::ParticipatorySpacePrivateUser
-          end
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/participatory_processes/abilities/admin_ability.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    module Abilities
-      # Defines the abilities for an admin user. Intended to be used with `cancancan`.
-      class AdminAbility < Decidim::Abilities::AdminAbility
-        def define_abilities
-          super
-
-          can :read, ParticipatoryProcess
-        end
-      end
-    end
-  end
-end

data/app/models/decidim/participatory_processes/abilities/everyone_ability.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    module Abilities
-      # Defines the base abilities related to participatory processes for any
-      # user. Guest users will use these too. Intended to be used with
-      # `cancancan`.
-      class EveryoneAbility < Decidim::Abilities::EveryoneAbility
-        def initialize(user, context)
-          super(user, context)
-
-          can :read, ParticipatoryProcessGroup
-          can :read, ParticipatoryProcess, &:published?
-        end
-      end
-    end
-  end
-end