decidim-demographics 0.32.0 → 0.32.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70f8ac69bd929f8c4653a78f650b134952332e6ba14f82e1ef6fe2266cd4b2cc
-  data.tar.gz: b7d3ee6973df5f833172c635fca9946e5ab6e5cb4884b415f13f3b6f143f5095
+  metadata.gz: dbec0f964b8dc4318c564fd619b9c888e28dab91b5a5a38e7abe8a8a8ae8932b
+  data.tar.gz: b3609adb93d0d8be7a59dd92fb2b709c3f0587b50e16e1595db4b42b8597c65b
 SHA512:
-  metadata.gz: 31461ef80a5bd3617d04d23a1476fe653a7247221bbffb0cf0e52dd38db89295fc9f96205d3ace6ba2feae0753c402375c6bb0322a63423d151fd1932a235093
-  data.tar.gz: ac772d326820f3fad2ba5206faf99716737c28aa5ea46fcdd3c9d35f281c84d8050750ee8aa7b5acd783d16abc2be44d25d97a3cff45cad871cb8d684f4122e6
+  metadata.gz: 37c4d17b334bbd123e4942d29da977cfb852ed2b80727321ecff8191e09478fe28ea01de542de0f59601d4ac343d80392cb64cf65f2009eb3f3b5bdc6419b737
+  data.tar.gz: 426a86d09961b23826a97d1f8105e27e2394ff589b905923b931276ec5cf6f9f52ca3ac94ea5475e14688dc2b7a69b3d7807abdd5f3932915abdcbe09ef275bb

data/app/controllers/decidim/demographics/admin/application_controller.rb

@@ -20,7 +20,7 @@ module Decidim
         private
 
         def questionnaire
-          @questionnaire ||= Decidim::Forms::Questionnaire.where(questionnaire_for:).first_or_create
+          @questionnaire ||= Decidim::Forms::Questionnaire.where(questionnaire_for:).first_or_create # rubocop:disable Decidim/OrganizationScopedFinder -- questionnaire_for returns a demographic scoped to current_organization
           @questionnaire.override_edit!
           @questionnaire
         end

data/app/controllers/decidim/demographics/admin/publish_responses_controller.rb

@@ -15,6 +15,8 @@ module Decidim
           enforce_permission_to(:index, :demographics)
         end
 
+        protected
+
         def questionnaire_url
           responses_path
         end

data/app/controllers/decidim/demographics/admin/questions_controller.rb

@@ -7,6 +7,8 @@ module Decidim
         include Decidim::Forms::Admin::Concerns::HasQuestionnaire
         include Decidim::Forms::Admin::Concerns::HasQuestionnaireResponsesUrlHelper
 
+        protected
+
         def permission_subject = :demographics
 
         def edit_questions_template = "decidim/demographics/admin/questions/edit"
@@ -20,7 +22,7 @@ module Decidim
         def response_options_url(_params) = decidim_admin_demographics.responses_path
 
         def questionnaire
-          @questionnaire ||= Decidim::Forms::Questionnaire.where(questionnaire_for:).first_or_initialize
+          @questionnaire ||= Decidim::Forms::Questionnaire.where(questionnaire_for:).first_or_initialize # rubocop:disable Decidim/OrganizationScopedFinder -- questionnaire_for returns a demographic scoped to current_organization
           @questionnaire.override_edit!
           Decidim::Demographics.create_default_questionnaire!(@questionnaire)
           @questionnaire

data/app/controllers/decidim/demographics/admin/responses_controller.rb

@@ -19,6 +19,8 @@ module Decidim
           render template: "decidim/demographics/admin/responses/index"
         end
 
+        protected
+
         def permission_subject = :demographics_responses
 
         def questionnaire_for = demographic

data/app/controllers/decidim/demographics/application_controller.rb

@@ -10,6 +10,8 @@ module Decidim
                            ::Decidim::Admin::Permissions,
                            ::Decidim::Permissions)
 
+      protected
+
       def permission_class_chain
         ::Decidim.permissions_registry.chain_for(::Decidim::Demographics::ApplicationController)
       end

data/app/controllers/decidim/demographics/demographics_controller.rb

@@ -10,6 +10,8 @@ module Decidim
       helper_method :allow_editing_responses?, :demographic
 
       def show
+        enforce_permission_to :read, :demographics
+
         @form = form(Decidim::Forms::QuestionnaireForm).from_model(questionnaire)
         @form.add_responses!(questionnaire:, session_token:, ip_hash:)
         @form.allow_editing_responses = true
@@ -18,6 +20,8 @@ module Decidim
       end
 
       def destroy
+        enforce_permission_to :destroy, :demographics
+
         DeleteDemographicData.call(questionnaire, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("destroy.success", scope: "decidim.demographics")
@@ -31,12 +35,12 @@ module Decidim
         end
       end
 
+      private
+
       def template
         "decidim/demographics/demographics/show"
       end
 
-      private
-
       def after_response_path = demographics_path
 
       def form_path = demographics_path

data/app/permissions/decidim/demographics/permissions.rb

@@ -8,7 +8,12 @@ module Decidim
         return permission_action unless permission_action.scope == :public
         return permission_action unless permission_action.subject == :demographics
 
-        toggle_allow(demographic.collect_data?) if permission_action.action == :respond
+        case permission_action.action
+        when :read, :destroy
+          allow!
+        when :respond
+          toggle_allow(demographic.collect_data?)
+        end
 
         permission_action
       end

data/config/locales/eu.yml

@@ -43,7 +43,7 @@ eu:
           delete_my_data: Ezabatu datua
           modal_close: Ezeztatu
           modal_ok: Ados
-          modal_question: Zure datu demografiko guztiak kendu egingo dira.
+          modal_question: Zure datu demografiko guztiak ezabatu egingo dira.
           modal_title: Ezabatu datua
           submit: Gorde datua
           terms_of_service: zerbitzuaren baldintzak
@@ -57,9 +57,9 @@ eu:
       questions:
         age:
           options:
-          - 15-29 urte bitartekoak
-          - 30-44 urte bitartekoak
-          - 45-64 urte bitartekoak
+          - 15 eta-29 urte bitartekoak
+          - 30 eta 44 urte bitartekoak
+          - 45 eta 64 urte bitartekoak
           - 65 urtekoak edo nagusiagoak
           question: Zein da zure adina?
         gender:

data/config/locales/gl.yml

@@ -1 +1,79 @@
+---
 gl:
+  decidim:
+    demographics:
+      actions:
+        title: Accións
+      admin:
+        demographics:
+          tabs_menu:
+            title: Datos demográficos
+        demographics_menu:
+          questions: Preguntas
+          responses: Respostas
+          settings: Configuración
+        publish_responses:
+          index:
+            description: Descrición
+            title: Mostrar respostas
+        questions:
+          edit:
+            save: Gardar
+            title: Preguntas
+          questions_form:
+            add_question: Engadir pregunta
+            collapse: Contraer todas as preguntas
+            expand: Expandir todas as preguntas
+        responses:
+          index:
+            publish_responses: Mostrar respostas
+            title: "%{total} respostas en total"
+        settings:
+          show:
+            collect_data: Activar a recollida de datos demográficos
+            collect_data_help: Ao activar esta configuración, as persoas participantes poderán ceder os seus datos á plataforma.
+            save: Gardar
+            title: Configuración
+          update:
+            invalid: Produciuse un erro ao gardar os datos demográficos
+            success: Os datos demográficos gardáronse correctamente
+        title: Datos demográficos
+      demographics:
+        questionnaire:
+          delete_my_data: Eliminar datos
+          modal_close: Cancelar
+          modal_ok: Aceptar
+          modal_question: Eliminaranse todos os teus datos demográficos.
+          modal_title: Eliminar datos
+          submit: Gardar datos
+          terms_of_service: termos do servizo
+          tos_agreement: Ao participar aceptas os %{link}.
+        show:
+          page_title: Cesión de datos demográficos
+      destroy:
+        error: Produciuse un erro ao eliminar os datos que cediches
+        success: Os datos que cediches elimináronse correctamente
+      name: Cesión de datos demográficos
+      questions:
+        age:
+          options:
+          - De 15 a 29 anos
+          - De 30 a 44 anos
+          - De 45 a 64 anos
+          - 65 anos ou máis
+          question: Que idade tes?
+        gender:
+          options:
+          - Home
+          - Muller
+          - Non binario
+          - O meu xénero non aparece na lista
+          - Prefiro non indicalo
+          question: Cal das seguintes opcións describe mellor o teu xénero?
+        postal:
+          question: Cal é o código postal do teu domicilio?
+  layouts:
+    decidim:
+      shared:
+        layout_center:
+          alert: Ao proporcionar esta información, contribúes á análise estatística que axuda a mellorar o indicador de calidade. Os teus datos agregaranse e utilizaranse unicamente con fins de investigación.

data/decidim-demographics.gemspec

@@ -3,7 +3,7 @@
 $LOAD_PATH.push File.expand_path("lib", __dir__)
 
 Gem::Specification.new do |s|
-  version = "0.32.0"
+  version = "0.32.2"
   s.version = version
   s.authors = ["Alexandru-Emil Lupu"]
   s.email = ["contact@alecslupu.ro"]

data/lib/decidim/demographics/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-demographics version.
   module Demographics
     def self.version
-      "0.32.0"
+      "0.32.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-demographics
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.32.2
 platform: ruby
 authors:
 - Alexandru-Emil Lupu
@@ -15,42 +15,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.32.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.32.2
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.32.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.32.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.32.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.32.2
 description: Module that collects demographic data about participants.
 email:
 - contact@alecslupu.ro