decidim-consultations 0.27.5 → 0.27.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 754a75ec236a6ca7b7201965bab583817ed51e14051803d7c57d0bee9a03d989
-  data.tar.gz: ce51283e54533b84420e5cbd6ae318e00d67b49bb22e0424ce7f6db696e3a1d4
+  metadata.gz: 70d308f959b191e49afa7cddadb93a6c1375e4690906f8078c71799d27ba0ea7
+  data.tar.gz: c19d420f1e83465d167ee2cbbb35cda7c3db64d3924fb9ab912ea553835fcc64
 SHA512:
-  metadata.gz: bf177d46b4c93a1f77916d05fd8fe871ef38d24dcfc1e60ebe16cac5b21554437078488cc2df50c4022ee4a532d97570db79d89d9b27b9347b0ea57e8bc8eb7e
-  data.tar.gz: 36bc34e3708a45ae2e224710d0c6a0e15412cb88e79e1a84d7f22905838a3da1b97b6504ce49d6d937980bce1a5d9bb8df767c4aebe0b6deb1b55400d7a37089
+  metadata.gz: e50752f7ece621a07b4b50164a29b60c6f36c6838936b2a935823dd56d98467e61f488e8e0dfb02d81ab11ff1d1e435859ef7f009c972444dbb810638d4174b9
+  data.tar.gz: 29287d203a004965f01674b3212e95760babf8f0bdad446202c3236f802c13911b315242e84cdad57e755cb1f8ad8800f31539bda49c5811ddc2bb99a3e19d09

data/app/controllers/decidim/consultations/consultation_widgets_controller.rb

@@ -4,13 +4,20 @@ module Decidim
   module Consultations
     class ConsultationWidgetsController < Decidim::WidgetsController
       helper Decidim::SanitizeHelper
+      helper ConsultationsHelper
 
       layout false
 
+      def show
+        enforce_permission_to :embed, :participatory_space, current_participatory_space: model if model
+
+        super
+      end
+
       private
 
       def model
-        @model ||= Consultation.find_by(slug: params[:consultation_slug])
+        @model ||= Consultation.where(organization: current_organization).published.find_by(slug: params[:consultation_slug])
       end
 
       def current_participatory_space
@@ -20,6 +27,10 @@ module Decidim
       def iframe_url
         @iframe_url ||= consultation_consultation_widget_url(model)
       end
+
+      def permission_class_chain
+        ::Decidim.permissions_registry.chain_for(::Decidim::Consultations::ApplicationController)
+      end
     end
   end
 end

data/app/controllers/decidim/consultations/question_widgets_controller.rb

@@ -8,10 +8,16 @@ module Decidim
 
       helper Decidim::SanitizeHelper
 
+      def show
+        enforce_permission_to :embed, :question, question: model if model
+
+        super
+      end
+
       private
 
       def model
-        @model ||= current_question
+        @model ||= current_question if current_question.published?
       end
 
       def current_participatory_space
@@ -21,6 +27,10 @@ module Decidim
       def iframe_url
         @iframe_url ||= question_question_widget_url(model)
       end
+
+      def permission_class_chain
+        ::Decidim.permissions_registry.chain_for(::Decidim::Consultations::ApplicationController)
+      end
     end
   end
 end

data/app/permissions/decidim/consultations/permissions.rb

@@ -5,6 +5,8 @@ module Decidim
     class Permissions < Decidim::DefaultPermissions
       def permissions
         allowed_public_anonymous_action?
+        allowed_public_embed_consultation_action?
+        allowed_public_embed_question_action?
 
         return permission_action unless user
 
@@ -22,7 +24,7 @@ module Decidim
       end
 
       def consultation
-        @consultation ||= context.fetch(:consultation, nil)
+        @consultation ||= context.fetch(:current_participatory_space, nil) || context.fetch(:consultation, nil)
       end
 
       def authorized?(permission_action, resource: nil)
@@ -45,6 +47,24 @@ module Decidim
         end
       end
 
+      def allowed_public_embed_consultation_action?
+        return unless permission_action.action == :embed &&
+                      [:consultation, :participatory_space].include?(permission_action.subject) &&
+                      consultation
+
+        return disallow! unless consultation.published?
+
+        allow!
+      end
+
+      def allowed_public_embed_question_action?
+        return unless permission_action.action == :embed && permission_action.subject == :question && question
+
+        return disallow! unless question.published?
+
+        allow!
+      end
+
       def allowed_public_action?
         return unless permission_action.scope == :public
         return unless permission_action.subject == :question

data/app/views/decidim/consultations/consultation_widgets/show.html.erb

@@ -1,3 +1,6 @@
+<p><%= translated_attribute(model.title) %></p>
+<p><%= current_organization.name %></p>
+
 <%= render partial: "decidim/consultations/consultations/consultation_details", locals: { consultation: model } %>
 <%= render partial: "decidim/consultations/consultations/highlighted_questions", locals: { consultation: model } %>
 <%= render partial: "decidim/consultations/consultations/regular_questions", locals: { consultation: model } %>

data/config/locales/bg.yml

@@ -1 +1,21 @@
+---
 bg:
+  activerecord:
+    errors:
+      models:
+        decidim/consultations/vote:
+          attributes:
+            question:
+              invalid_num_votes: Броят на гласовете е невалиден
+  decidim:
+    admin:
+      consultations:
+        deprecation_warning: Модулът за консултации ще бъде отхвърлен в близко бъдеще. Работим върху следващата криптографски защитена версия, наречена Гласувания.
+      question_configuration:
+        disable_external_voting: Моля, деактивирайте външното гласуване за разширени конфигурации
+    consultations:
+      last_activity:
+        new_question_at_html: "<span>Нов въпрос в(ъв) %{link}</span>"
+      question_votes:
+        create:
+          error: Възникна проблем с гласуването по въпроса

data/config/locales/de.yml

@@ -24,8 +24,8 @@ de:
         max_votes: Maximale Anzahl von Stimmen
         min_votes: Mindestanzahl von Stimmen
         origin_scope: Umfang
-        origin_title: Ursprung
-        origin_url: Ursprungs-URL
+        origin_title: Herkunft
+        origin_url: Herkunfts--URL
         participatory_scope: Partizipativer Bereich
         promoter_group: Promoter-Gruppe
         question_context: Kontext
@@ -267,7 +267,7 @@ de:
         title: Konsultationen
       last_activity:
         new_consultation: Neue Konsultation
-        new_question_at_html: "<span>Neue Frage bei %{link}</span>"
+        new_question_at_html: "<span>Neue Frage auf %{link}</span>"
       pages:
         home:
           highlighted_consultations:

data/config/locales/he-IL.yml

@@ -0,0 +1 @@
+he:

data/config/locales/hu.yml

@@ -95,6 +95,7 @@ hu:
         create:
           error: Hiba történt az új konzultáció létrehozása során.
           success: Konzultáció létrehozása sikeres.
+        deprecation_warning: A konzultációk modul a közeljövőben elavulttá válik. Dolgozunk a következő kriptográfiailag biztonságos változaton, a Szavazásokon.
         edit:
           update: Frissítés
         form:
@@ -361,6 +362,10 @@ hu:
         actions:
           comment: Megjegyzés
           vote: Szavazás
+      question:
+        actions:
+          comment: Hozzászólás
+          vote: Szavazás
     statistics:
       consultations_count: Konzultációk
       votes_count: Szavazások

data/decidim-consultations.gemspec

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+require "decidim/consultations/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.version = Decidim::Consultations.version
+  s.authors = ["Juan Salvador Perez Garcia"]
+  s.email = ["jsperezg@gmail.com"]
+  s.license = "AGPL-3.0"
+  s.homepage = "https://github.com/decidim/decidim"
+  s.required_ruby_version = "~> 3.0.0"
+
+  s.name = "decidim-consultations"
+  s.summary = "Decidim consultations module"
+  s.description = "Extends Decidim adding a first level public consultation component"
+
+  s.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").select do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
+    end
+  end
+
+  s.add_dependency "decidim-admin", Decidim::Consultations.version
+  s.add_dependency "decidim-comments", Decidim::Consultations.version
+  s.add_dependency "decidim-core", Decidim::Consultations.version
+
+  s.add_development_dependency "decidim-dev", Decidim::Consultations.version
+end

data/lib/decidim/consultations/admin_engine.rb

@@ -157,7 +157,7 @@ module Decidim
       initializer "decidim_consultations.admin_consultation_components_menu" do
         Decidim.menu :admin_consultation_components_menu do |menu|
           current_participatory_space.components.each do |component|
-            caption = translated_attribute(component.name)
+            caption = decidim_escape_translated(component.name)
             if component.primary_stat.present?
               caption += content_tag(:span, component.primary_stat, class: component.primary_stat.zero? ? "component-counter component-counter--off" : "component-counter")
             end

data/lib/decidim/consultations/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     def self.version
-      "0.27.5"
+      "0.27.6"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-consultations
 version: !ruby/object:Gem::Version
-  version: 0.27.5
+  version: 0.27.6
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.5
+        version: 0.27.6
 description: Extends Decidim adding a first level public consultation component
 email:
 - jsperezg@gmail.com
@@ -275,6 +275,7 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
+- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -362,6 +363,7 @@ files:
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
 - db/seeds/homepage_image.jpg
+- decidim-consultations.gemspec
 - lib/decidim/api/consultation_question_type.rb
 - lib/decidim/api/consultation_type.rb
 - lib/decidim/consultations.rb
@@ -377,23 +379,23 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.2.22
+signing_key: 
 specification_version: 4
 summary: Decidim consultations module
 test_files: []