decidim-decidim_awesome 0.11.1 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 107f5d454725a66c2a3a7658d9c841616a4556f634a6615c5f124ad2815c94b2
-  data.tar.gz: cc18503da6d79d49787f40a6a6da9fe659d64c05183c599a30800a25a874c5b9
+  metadata.gz: ca78262a57db332a236230c15e2584c2dcbc1f5ee6055400b7fc187fbb24dfae
+  data.tar.gz: 48a4aa2ca9b10d8f9c6a8b4a6dc3e8084360e87398ad1c5160a87e9569e18060
 SHA512:
-  metadata.gz: 7da76c3a55fac5f16814946e9de813e7e30f2f56523a62143b20ad52bf16863abfd5da3a79ac44c7a0aedffc4e9ddec232bed2732153474ac586cecac0acb302
-  data.tar.gz: d5c566fe5297b253b6004ad23007fc22d7a47c5aa9a0a310de319799c2fdfced27cf1b0c0861e8c9341d041eeb556571c0d65b8ae16d56fcb6b16eafe30a7d54
+  metadata.gz: e59ee2965fc55d0e8874a2745508ef10d15fe8d2582e5a1dad84f79810d0b39d4f58124f637c88a7100eaca171e9a59237f792f7acce7485ceae8de8b05f5ee5
+  data.tar.gz: e66c77623b540ed323d083d2d68967e033dc3bfed826ef82df9db5c40832fab46253ac5d3840a38226aa547cee7ca33ba5a6a4caf76b13e2612e983a6ddc5b1b

data/CHANGELOG.md

@@ -1,6 +1,27 @@
 CHANGELOG
 =========
 
+v0.11.3
+-------
+Compatibility:
+  - Decidim v0.28.x
+
+Features:
+  - Added user time zones in account settings
+  - Added custom styles for the admin panel
+  - Added Verification tweaks
+  - Added Admin manual verifications
+
+v0.11.2
+-------
+
+Compatibility:
+  - Decidim v0.28.x
+
+Features:
+  - SQL vulnerability fix for admin accountability
+  - Private fields proposal draft update fix
+
 v0.11.1
 ------
 

data/README.md

@@ -83,9 +83,15 @@ With this feature you can have a support chat in Decidim. It is linked to a [Tel
 
 #### 8. Custom CSS applied only according scoped restrictions
 
-With this feature you can create directly in the admin a CSS snipped that is only applied globally, in a particular assembly or even a single proposal!
+##### 8.1 Public styles
+With this feature you can create directly in the admin a CSS snipped that is only applied in the public frontend, in a particular assembly or even a single proposal!
 
-![CSS screenshot](examples/custom_styles.png)
+![CSS screenshot](examples/custom_styles_public.png)
+
+##### 8.2 Admin styles
+With this feature you can create directly in the admin a CSS snipped that is only applied in the admin panel, in a particular assembly or even a single proposal!
+
+![CSS screenshot](examples/custom_styles_admin.png)
 
 #### 9. Change the main menu of Decidim entirely!
 
@@ -379,6 +385,46 @@ This menu will show if there's any data older than 6 months (configurable) and w
 
 ![Private data](examples/private_data.png)
 
+#### 19. User custom timezone
+
+If your organization spans across multiple timezones, you can enable this feature under the "Surveys & Forms" section in the Awesome admin panel. This allows users to set their own timezone, which will be used to display dates and times throughout the platform according to their preference.
+
+![User time zone select](examples/user_timezone.png)
+
+#### 20. Mandatory verifications
+
+This feature allows admins to enforce mandatory verifications for users before they can access the platform. Admins can configure which verifications are required.
+
+Admins can manage these settings in the Awesome admin panel under the "Verifications" section.
+
+![Forced verifications admin side](examples/forced_verifications_admin.png)
+![Forced verifications public side](examples/forced_verifications_public.png)
+
+Note that some pages are allowed, you can even configure which controller are allowed by creating an initializer ("required_authorizations" and "authorizations" are always allowed):
+
+```ruby
+# config/initializers/decidim_awesome.rb
+
+Decidim::DecidimAwesome.configure do |config|
+  # default controllers are "account" and "pages"
+  config.force_authorization_allowed_controller_names = %w(account pages homepage)
+```
+
+#### 21. Manual verifications
+
+The admin will be allowed to manually authorize users using the methods specified in the `/system` admin section.
+Currently, only form based handlers are supported (Direct methods). 
+Admins can manually override or verify users in the participants list but they still have to fulfill the requirements of the verifier (although they will be allowed to force the authorization even if some of them fails).
+
+Admin logs are also created in each action for accountability.
+
+System configuration:
+
+![System manual authorization config](examples/manual_verifications_system.png)
+![List of authorizations](examples/manual_verifications_1.png)
+![Removing an authorization](examples/manual_verifications_2.png)
+![Creating an authorization](examples/manual_verifications_3.png)
+
 #### To be continued...
 
 We're not done! Please check the [issues](/decidim-ice/decidim-module-decidim_awesome/issues) (and participate) to see what's on our mind
@@ -401,6 +447,12 @@ bin/rails decidim:upgrade
 bin/rails db:migrate
 ```
 
+> In production mode you must also precompile the assets:
+>
+> ```
+> bin/rails assets:precompile
+> ```
+
 Go to `yourdomain/admin/decidim_awesome` and start tweaking things!
 
 > **EXPERTS ONLY**

data/app/cells/concerns/decidim/decidim_awesome/proposal_l_cell_override.rb

@@ -8,36 +8,18 @@ module Decidim
       included do
         private
 
+        alias_method :decidim_original_cache_hash, :cache_hash
+
         def metadata_cell
-          awesome_voting_manifest_for(resource&.component)&.proposal_metadata_cell.presence || "decidim/proposals/proposal_metadata"
+          @metadata_cell ||= awesome_voting_manifest_for(resource&.component)&.proposal_metadata_cell.presence || "decidim/proposals/proposal_metadata"
         end
 
-        # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/PerceivedComplexity
         def cache_hash
-          hash = []
-          hash << I18n.locale.to_s
-          hash << model.cache_key_with_version
-          hash << model.proposal_votes_count
-          hash << model.extra_fields&.reload&.vote_weight_totals
-          hash << model.endorsements_count
-          hash << model.comments_count
-          hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
-          hash << Digest::MD5.hexdigest(resource_image_path) if resource_image_path
-          hash << render_space? ? 1 : 0
-          if current_user
-            hash << current_user.cache_key_with_version
-            hash << current_user.follows?(model) ? 1 : 0
-          end
-          hash << model.follows_count
-          hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
-          hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
-          hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
+          all_extra_fields = memoize("extra_fields")
+          extra_fields = all_extra_fields ? all_extra_fields[resource.id] : resource.extra_fields
 
-          hash.join(Decidim.cache_key_separator)
+          @cache_hash ||= "#{decidim_original_cache_hash}#{Decidim.cache_key_separator}#{extra_fields&.vote_weight_totals}"
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
-        # rubocop:enable Metrics/PerceivedComplexity
       end
     end
   end

data/app/cells/decidim/decidim_awesome/content_blocks/map_cell.rb

@@ -46,11 +46,7 @@ module Decidim
                 true
               when :proposals
                 component.settings.geocoding_enabled
-              else
-                false
               end
-            else
-              false
             end
           end
         end

data/app/cells/decidim/decidim_awesome/voting/proposal_metadata_cell.rb

@@ -12,7 +12,7 @@ module Decidim
         end
 
         def current_vote
-          @current_vote ||= Decidim::Proposals::ProposalVote.find_by(author: current_user, proposal: resource)
+          @current_vote ||= vote_for(current_user) if current_user
         end
 
         def user_voted_weight
@@ -24,7 +24,7 @@ module Decidim
             weights = [3, 2, 1]
             weights << 0 if resource.component.settings.voting_cards_show_abstain
             weights.index_with do |weight|
-              resource.weight_count(weight)
+              weight_count_for(weight)
             end
           end
         end
@@ -38,7 +38,7 @@ module Decidim
         end
 
         def weight_count_item
-          return unless resource.respond_to?(:weight_count)
+          # return unless resource.respond_to?(:weight_count)
           return if resource.component.current_settings.votes_hidden?
           return if resource&.rejected? || resource&.withdrawn?
 
@@ -48,6 +48,21 @@ module Decidim
             data_attributes: all_weights.transform_keys { |num| "weight-#{num}" }
           }
         end
+
+        def vote_for(user)
+          user_votes = memoize("user_votes")
+          return user_votes[resource.id] if user_votes
+
+          resource.votes.find_by(author: user)
+        end
+
+        def weight_count_for(weight)
+          all_extra_fields = memoize("extra_fields")
+          extra_fields = all_extra_fields ? all_extra_fields[resource.id] : resource.extra_fields
+          return 0 unless extra_fields
+
+          extra_fields.vote_weight_totals[weight.to_s] || 0
+        end
       end
     end
   end

data/app/commands/concerns/decidim/decidim_awesome/proposals/create_proposal_override.rb

@@ -15,10 +15,10 @@ module Decidim
           alias_method :decidim_original_create_proposal, :create_proposal
 
           def create_proposal
-            created_proposal = decidim_original_create_proposal
+            decidim_original_create_proposal
             # Update the proposal with the private body, to
             # avoid tracebility on private fields.
-            created_proposal.update_private_body!(form.private_body) if form.private_body.present?
+            @proposal.update_private_body!(form.private_body) if form.private_body.present?
           end
         end
       end

data/app/commands/concerns/decidim/decidim_awesome/proposals/update_proposal_override.rb

@@ -15,8 +15,8 @@ module Decidim
 
           alias_method :decidim_original_update_draft, :update_draft
 
-          def update_proposal
-            decidim_original_update_proposal
+          def update_draft
+            decidim_original_update_draft
             update_private_field!
           end
         end

data/app/commands/concerns/decidim/decidim_awesome/system/register_organization_override.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module System
+      module RegisterOrganizationOverride
+        extend ActiveSupport::Concern
+
+        included do
+          private
+
+          alias_method :decidim_create_organization, :create_organization
+
+          def create_organization
+            @organization = decidim_create_organization
+            if form.clean_awesome_admins_available_authorizations.present?
+              AwesomeConfig.create!(
+                var: :admins_available_authorizations,
+                organization: @organization,
+                value: form.clean_awesome_admins_available_authorizations
+              )
+            end
+            @organization
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/system/update_organization_override.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module System
+      module UpdateOrganizationOverride
+        extend ActiveSupport::Concern
+
+        included do
+          private
+
+          alias_method :decidim_original_save_organization, :save_organization
+
+          def save_organization
+            decidim_original_save_organization
+            if form.clean_awesome_admins_available_authorizations.present?
+              add_awesome_configs!
+            elsif awesome_config&.persisted?
+              awesome_config.destroy!
+            end
+          end
+
+          def add_awesome_configs!
+            awesome_config.value = form.clean_awesome_admins_available_authorizations
+            awesome_config.save!
+          end
+
+          def awesome_config
+            @awesome_config ||= AwesomeConfig.find_or_initialize_by(var: :admins_available_authorizations, organization: @organization)
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/update_account_override.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module UpdateAccountOverride
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method :decidim_update_personal_data, :update_personal_data
+        alias_method :decidim_send_update_summary!, :send_update_summary!
+
+        def update_personal_data
+          decidim_update_personal_data
+          return if @form.user_time_zone.blank?
+
+          @user.extended_data ||= {}
+          if @form.user_time_zone == @user.organization.time_zone
+            @user.extended_data.delete("time_zone")
+          else
+            @user.extended_data["time_zone"] = @form.user_time_zone
+          end
+        end
+
+        def send_update_summary!(changes)
+          decidim_send_update_summary!(changes - ["extended_data"])
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/decidim_awesome/admin/create_scoped_style.rb

@@ -6,9 +6,10 @@ module Decidim
       class CreateScopedStyle < Command
         # Public: Initializes the command.
         #
-        def initialize(organization)
+        def initialize(organization, config_var = :scoped_styles)
           @organization = organization
           @ident = rand(36**8).to_s(36)
+          @config_var = config_var
         end
 
         # Executes the command. Broadcasts these events:
@@ -18,7 +19,7 @@ module Decidim
         #
         # Returns nothing.
         def call
-          styles = AwesomeConfig.find_or_initialize_by(var: :scoped_styles, organization: @organization)
+          styles = AwesomeConfig.find_or_initialize_by(var: @config_var, organization: @organization)
           styles.value = {} unless styles.value.is_a? Hash
           # TODO: prevent (unlikely) colisions with exisiting values
           styles.value[@ident] = ""

data/app/commands/decidim/decidim_awesome/admin/destroy_scoped_style.rb

@@ -6,11 +6,12 @@ module Decidim
       class DestroyScopedStyle < Command
         # Public: Initializes the command.
         #
-        # key - the key to destroy inside scoped_styles
+        # key - the key to destroy inside scoped_styles/scoped_admin_styles
         # organization
-        def initialize(key, organization)
+        def initialize(key, organization, config_var = :scoped_styles)
           @key = key
           @organization = organization
+          @config_var = config_var
         end
 
         # Executes the command. Broadcasts these events:
@@ -20,14 +21,15 @@ module Decidim
         #
         # Returns nothing.
         def call
-          styles = AwesomeConfig.find_by(var: :scoped_styles, organization: @organization)
+          styles = AwesomeConfig.find_by(var: @config_var, organization: @organization)
           return broadcast(:invalid, "Not a hash") unless styles&.value.is_a? Hash
           return broadcast(:invalid, "#{key} key invalid") unless styles.value.has_key?(@key)
 
           styles.value.except!(@key)
           styles.save!
           # remove constrains associated (a new config var is generated automatically, by removing it, it will trigger destroy on dependents)
-          constraint = AwesomeConfig.find_by(var: "scoped_style_#{@key}", organization: @organization)
+          constraint = @config_var == :scoped_styles ? :scoped_style : :scoped_admin_style
+          constraint = AwesomeConfig.find_by(var: "#{constraint}_#{@key}", organization: @organization)
           constraint.destroy! if constraint.present?
 
           broadcast(:ok, @key)

data/app/controllers/concerns/decidim/decidim_awesome/admin_accountability/admin/filterable_helper.rb

@@ -13,10 +13,11 @@ module Decidim
           end
 
           def applied_filters_tags(i18n_ctx)
-            if global? && params[:admin_role_type].present?
+            admin_role_type = PaperTrailVersion.safe_admin_role_type(params[:admin_role_type])
+            if global? && admin_role_type.present?
               content_tag(:span, class: "label secondary") do
                 concat "#{i18n_filter_label(:admin_role_type, filterable_i18n_scope_from_ctx(i18n_ctx))}: "
-                concat t("decidim.decidim_awesome.admin.admin_accountability.admin_roles.#{params[:admin_role_type]}", default: params[:admin_role_type])
+                concat t("decidim.decidim_awesome.admin.admin_accountability.admin_roles.#{admin_role_type}", default: admin_role_type)
                 concat icon_link_to(
                   "close-circle-line",
                   url_for(export_params.except(:admin_role_type)),

data/app/controllers/concerns/decidim/decidim_awesome/check_login_authorizations.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module CheckLoginAuthorizations
+      extend ActiveSupport::Concern
+
+      included do
+        include ::Decidim::DecidimAwesome::NeedsAwesomeConfig
+        before_action :check_required_login_authorizations
+      end
+
+      private
+
+      def check_required_login_authorizations
+        return unless user_signed_in?
+        return unless current_user.confirmed?
+        return if current_user.blocked?
+        return if allowed_controllers.include?(controller_name)
+
+        unless user_is_authorized?
+          flash[:alert] = I18n.t("decidim.decidim_awesome.session.authorization_is_required",
+                                 authorizations: required_authorizations.map(&:fullname).join(", "))
+          redirect_to decidim_decidim_awesome.required_authorizations_path(redirect_url: request.fullpath)
+        end
+      end
+
+      def user_is_authorized?
+        return true if required_authorizations.blank?
+
+        @user_is_authorized ||= if awesome_config[:force_authorization_with_any_method]
+                                  current_authorizations.any?
+                                else
+                                  current_authorizations.count == required_authorizations.count
+                                end
+      end
+
+      def required_authorizations
+        return unless awesome_config[:force_authorization_after_login].is_a?(Array)
+
+        @required_authorizations ||= Decidim::Verifications::Adapter.from_collection(
+          awesome_config[:force_authorization_after_login] & current_organization.available_authorizations & Decidim.authorization_workflows.map(&:name)
+        )
+      end
+
+      def current_authorizations
+        @current_authorizations ||= Decidim::Verifications::Authorizations.new(
+          organization: current_organization,
+          user: current_user,
+          name: required_authorizations.map(&:name),
+          granted: true
+        )
+      end
+
+      def allowed_controllers
+        %w(required_authorizations authorizations upload_validations timeouts editor_images locales) + awesome_config[:force_authorization_allowed_controller_names].to_a
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/decidim_awesome/needs_awesome_config.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "decidim/decidim_awesome/awesome_helpers"
-
 module Decidim
   module DecidimAwesome
     module NeedsAwesomeConfig

data/app/controllers/concerns/decidim/decidim_awesome/proposals/memoize_extra_fields.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      module MemoizeExtraFields
+        extend ActiveSupport::Concern
+        include Decidim::DecidimAwesome::RequestMemoizer
+
+        included do
+          alias_method :decidim_original_index, :index
+
+          def index
+            decidim_original_index
+
+            memoize("extra_fields") { Decidim::DecidimAwesome::ProposalExtraField.where(proposal: @proposals).index_by(&:decidim_proposal_id) }
+            memoize("user_votes") { Decidim::Proposals::ProposalVote.where(proposal: proposals, author: current_user).index_by(&:decidim_proposal_id) if current_user }
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/decidim_awesome/proposals/orderable_override.rb

@@ -14,6 +14,8 @@ module Decidim
 
           private
 
+          alias_method :decidim_original_reorder, :reorder
+
           # read order from session if available
           def order
             @order ||= detect_order(session[:order]) || default_order
@@ -31,38 +33,23 @@ module Decidim
             end
           end
 
-          # rubocop:disable Metrics/CyclomaticComplexity
           def reorder(proposals)
+            title_by_locale = Arel.sql(proposals.sanitize_sql(["decidim_proposals_proposals.title->>? #{collation}", locale]))
+            title_by_machine_translation = Arel.sql(proposals.sanitize_sql(["decidim_proposals_proposals.title->'machine_translations'->>? #{collation}", locale]))
+            title_by_default_locale = Arel.sql(proposals.sanitize_sql(["decidim_proposals_proposals.title->>? #{collation}", default_locale]))
             case order
             when "az"
-              proposals.order(Arel.sql("CONCAT(decidim_proposals_proposals.title->>'#{locale}',
-                                        decidim_proposals_proposals.title->'machine_translations'->>'#{locale}',
-                                        decidim_proposals_proposals.title->>'#{default_locale}') #{collation} ASC"))
+              proposals.order(title_by_locale => :asc, title_by_machine_translation => :asc, title_by_default_locale => :asc)
             when "za"
-              proposals.order(Arel.sql("CONCAT(decidim_proposals_proposals.title->>'#{locale}',
-                                        decidim_proposals_proposals.title->'machine_translations'->>'#{locale}',
-                                        decidim_proposals_proposals.title->>'#{default_locale}') #{collation} DESC"))
+              proposals.order(title_by_locale => :desc, title_by_machine_translation => :desc, title_by_default_locale => :desc)
             when "supported_first"
               proposals.joins(my_votes_join).group(:id).order(Arel.sql("COUNT(decidim_proposals_proposal_votes.id) DESC"))
             when "supported_last"
               proposals.joins(my_votes_join).group(:id).order(Arel.sql("COUNT(decidim_proposals_proposal_votes.id) ASC"))
-            when "most_commented"
-              proposals.left_joins(:comments).group(:id).order(Arel.sql("COUNT(decidim_comments_comments.id) DESC"))
-            when "most_endorsed"
-              proposals.order(endorsements_count: :desc)
-            when "most_followed"
-              proposals.left_joins(:follows).group(:id).order(Arel.sql("COUNT(decidim_follows.id) DESC"))
-            when "most_voted"
-              proposals.order(proposal_votes_count: :desc)
-            when "random"
-              proposals.order_randomly(random_seed)
-            when "recent"
-              proposals.order(published_at: :desc)
-            when "with_more_authors"
-              proposals.order(coauthorships_count: :desc)
+            else
+              decidim_original_reorder(proposals)
             end
           end
-          # rubocop:enable Metrics/CyclomaticComplexity
 
           def collation
             @collation ||= begin

data/app/controllers/concerns/decidim/decidim_awesome/use_user_time_zone.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module UseUserTimeZone
+      extend ActiveSupport::Concern
+
+      included do
+        around_action :use_user_time_zone, if: -> { user_time_zone.present? }
+        helper_method :user_time_zone
+
+        # Executes a block of code in the context of the user's time zone
+        #
+        # &action - a block of code to be wrapped around the time zone
+        #
+        # Returns nothing.
+        def use_user_time_zone(&)
+          Time.use_zone(user_time_zone, &)
+        end
+
+        # The current time zone from the user. Available as a helper for the views.
+        #
+        # Returns a String.
+        def user_time_zone
+          return if helpers&.awesome_config&.[](:user_timezone).blank?
+
+          @user_time_zone ||= current_user&.extended_data&.[]("time_zone")
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/decidim_awesome/admin/admin_accountability_controller.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       class AdminAccountabilityController < DecidimAwesome::Admin::ApplicationController
         include NeedsAwesomeConfig
-        include Decidim::DecidimAwesome::AdminAccountability::Admin::Filterable
+        include AdminAccountability::Admin::Filterable
 
         helper_method :admin_actions, :collection, :export_params, :global?, :global_users_missing_date
 
@@ -20,9 +20,9 @@ module Decidim
         def export
           filters = export_params[:q]
 
-          Decidim::DecidimAwesome::ExportAdminActionsJob.perform_later(current_user,
-                                                                       params[:format].to_s,
-                                                                       admin_actions.ransack(filters).result.ids)
+          ExportAdminActionsJob.perform_later(current_user,
+                                              params[:format].to_s,
+                                              admin_actions.ransack(filters).result.ids)
 
           redirect_back fallback_location: decidim_admin_decidim_awesome.admin_accountability_path,
                         notice: t("decidim.decidim_awesome.admin.admin_accountability.exports.notice")
@@ -39,11 +39,11 @@ module Decidim
         end
 
         def space_role_actions
-          @space_role_actions ||= Decidim::DecidimAwesome::PaperTrailVersion.space_role_actions(current_organization)
+          @space_role_actions ||= PaperTrailVersion.space_role_actions(current_organization)
         end
 
         def admin_role_actions
-          @admin_role_actions ||= Decidim::DecidimAwesome::PaperTrailVersion.in_organization(current_organization).admin_role_actions(params[:admin_role_type])
+          @admin_role_actions ||= PaperTrailVersion.in_organization(current_organization).admin_role_actions(PaperTrailVersion.safe_admin_role_type(params[:admin_role_type]))
         end
 
         def export_params
@@ -61,7 +61,7 @@ module Decidim
           return unless global?
 
           @global_users_missing_date ||= begin
-            first_version = Decidim::DecidimAwesome::PaperTrailVersion.where(item_type: "Decidim::UserBaseEntity").last
+            first_version = PaperTrailVersion.where(item_type: "Decidim::UserBaseEntity").last
             first_user = Decidim::User.first
             first_version.created_at if first_user && first_version && (first_version.created_at > first_user.created_at + 1.second)
           end