Fix permissions and locales

DiputacioBarcelona · Dec 4, 2018 · acc79c5 · acc79c5
1 parent 475c791
commit acc79c5
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 4 deletions.
diff --git a/app/services/diba_authorization_handler.rb b/app/services/diba_authorization_handler.rb
@@ -24,6 +24,7 @@ class DibaAuthorizationHandler < Decidim::AuthorizationHandler
 
   def censed
     return if diba_handler.valid?
+
     errors.add(:id_document, I18n.t('decidim.census.errors.messages.not_censed'))
   end
 

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
@@ -6,6 +6,13 @@ ca:
         id_document: Número de document
         birthdate: Data de naixement
   decidim:
+    verifications:
+      authorizations:
+        first_login:
+            actions:
+              diba_authorization_handler: 'Padró municipal'
+              census_authorization_handler: 'Padró municipal'
+              diba_census_api_authorization_handler: 'Padró municipal'
     authorization_handlers:
       diba_authorization_handler:
         name: 'Padró municipal'

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -6,6 +6,13 @@ en:
         id_document: Identity document
         birthdate: Date of birth
   decidim:
+    verifications:
+      authorizations:
+        first_login:
+            actions:
+              diba_authorization_handler: 'Municipality Census'
+              census_authorization_handler: 'Municipality Census'
+              diba_census_api_authorization_handler: 'Municipality Census'
     authorization_handlers:
       diba_authorization_handler:
         name: Municipality Census

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -6,6 +6,13 @@ es:
         id_document: Número de documento
         birthdate: Fecha de nacimiento
   decidim:
+    verifications:
+      authorizations:
+        first_login:
+            actions:
+              diba_authorization_handler: 'Padrón Municipal'
+              census_authorization_handler: 'Padrón Municipal'
+              diba_census_api_authorization_handler: 'Padrón Municipal'
     authorization_handlers:
       diba_authorization_handler:
         name: Padrón Municipal

diff --git a/decidim-census/app/permissions/decidim/census/admin/permissions.rb b/decidim-census/app/permissions/decidim/census/admin/permissions.rb
@@ -10,8 +10,7 @@ def permissions
           return permission_action if permission_action.scope != :admin
           return permission_action if permission_action.subject != :census
 
-          allow! if permission_action.action == :create
-          allow! if permission_action.action == :destroy
+          allow! if user.admin?
 
           permission_action
         end

diff --git a/decidim-census/spec/factories/census_datum.rb b/decidim-census/spec/factories/census_datum.rb
@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :census_datum, class: Decidim::Census::CensusDatum do
-    id_document '123456789A'
-    birthdate 20.years.ago
+    id_document { '123456789A' }
+    birthdate { 20.years.ago }
     organization
   end
 end