decidim-proposals 0.30.2 → 0.31.0.rc1

data/app/helpers/decidim/proposals/admin/proposals_helper.rb

@@ -36,8 +36,8 @@ module Decidim
           end
         end
 
-        def endorsers_presenters_for(proposal)
-          proposal.endorsements.for_listing.map { |identity| present(identity.normalized_author) }
+        def likes_presenters_for(proposal)
+          proposal.likes.for_listing.map { |identity| present(identity.author) }
         end
 
         def proposal_complete_state(proposal)
@@ -46,21 +46,6 @@ module Decidim
 
           translated_attribute(proposal&.proposal_state&.title)
         end
-
-        def icon_with_link_to_proposal(proposal)
-          icon, tooltip = if allowed_to?(:create, :proposal_answer, proposal:) && !proposal.emendation?
-                            [
-                              "question-answer-line",
-                              t(:answer_proposal, scope: "decidim.proposals.actions")
-                            ]
-                          else
-                            [
-                              "information-line",
-                              t(:show, scope: "decidim.proposals.actions")
-                            ]
-                          end
-          icon_link_to(icon, proposal_path(proposal), tooltip, class: "icon--small action-icon--show-proposal")
-        end
       end
     end
   end

data/app/helpers/decidim/proposals/application_helper.rb

@@ -8,7 +8,7 @@ module Decidim
       include Decidim::Comments::CommentsHelper
       include PaginateHelper
       include ProposalVotesHelper
-      include ::Decidim::EndorsableHelper
+      include ::Decidim::LikeableHelper
       include ::Decidim::FollowableHelper
       include Decidim::MapHelper
       include Decidim::Proposals::MapHelper
@@ -118,9 +118,8 @@ module Decidim
       # Returns :text_area or :editor based on the organization' settings.
       def text_editor_for_proposal_body(form)
         options = {
-          class: "js-hashtags",
-          hashtaggable: true,
-          value: form_presenter.body(extras: false, strip_tags: !current_organization.rich_text_editor_in_public_views).strip
+          value: form_presenter.body(strip_tags: !current_organization.rich_text_editor_in_public_views).strip,
+          data: { controller: "character-counter" }
         }
 
         text_editor_for(form, :body, options)
@@ -171,7 +170,6 @@ module Decidim
       # Explicitly commenting the used I18n keys so their are not flagged as unused
       # i18n-tasks-use t('decidim.proposals.application_helper.filter_origin_values.official')
       # i18n-tasks-use t('decidim.proposals.application_helper.filter_origin_values.participants')
-      # i18n-tasks-use t('decidim.proposals.application_helper.filter_origin_values.user_groups')
       # i18n-tasks-use t('decidim.proposals.application_helper.filter_origin_values.official')
       # i18n-tasks-use t('decidim.proposals.application_helper.filter_origin_values.meetings')
       # i18n-tasks-use t('decidim.proposals.application_helper.filter_origin_values.all')
@@ -180,7 +178,6 @@ module Decidim
         origin_values = []
         origin_values << TreePoint.new("official", t("official", scope:)) if component_settings.official_proposals_enabled
         origin_values << TreePoint.new("participants", t("participants", scope:))
-        origin_values << TreePoint.new("user_group", t("user_groups", scope:)) if current_organization.user_groups_enabled?
         origin_values << TreePoint.new("meeting", t("meetings", scope:))
 
         TreeNode.new(

data/app/jobs/decidim/proposals/settings_change_job.rb

@@ -12,9 +12,9 @@ module Decidim
         elsif voting_enabled?(previous_settings, current_settings)
           event = "decidim.events.proposals.voting_enabled"
           event_class = Decidim::Proposals::VotingEnabledEvent
-        elsif endorsing_enabled?(previous_settings, current_settings)
-          event = "decidim.events.proposals.endorsing_enabled"
-          event_class = Decidim::Proposals::EndorsingEnabledEvent
+        elsif liking_enabled?(previous_settings, current_settings)
+          event = "decidim.events.proposals.liking_enabled"
+          event_class = Decidim::Proposals::LikingEnabledEvent
         end
 
         return unless event && event_class
@@ -40,9 +40,9 @@ module Decidim
           (!!previous_settings[:votes_enabled] == false || previous_settings[:votes_blocked] == true)
       end
 
-      def endorsing_enabled?(previous_settings, current_settings)
-        (current_settings[:endorsements_enabled] == true && !!current_settings[:endorsements_blocked] == false) &&
-          (!!previous_settings[:endorsements_enabled] == false || previous_settings[:endorsements_blocked] == true)
+      def liking_enabled?(previous_settings, current_settings)
+        (current_settings[:likes_enabled] == true && !!current_settings[:likes_blocked] == false) &&
+          (!!previous_settings[:likes_enabled] == false || previous_settings[:likes_blocked] == true)
       end
       # rubocop:enable Style/DoubleNegation
     end

data/app/models/decidim/proposals/collaborative_draft.rb

@@ -34,7 +34,7 @@ module Decidim
 
       STATES = { open: 0, published: 10, withdrawn: -1 }.freeze
 
-      enum state: STATES, _default: "open"
+      enum :state, STATES, default: "open"
       scope :except_withdrawn, -> { not_withdrawn.or(where(state: nil)) }
 
       scope_search_multi :with_any_state, [:open, :published, :withdrawn]

data/app/models/decidim/proposals/{valuation_assignment.rb → evaluation_assignment.rb}

@@ -2,23 +2,23 @@
 
 module Decidim
   module Proposals
-    # A valuation assignment links a proposal and a Valuator user role.
-    # Valuators will be users in charge of defining the monetary cost of a
+    # An evaluation assignment links a proposal and an Evaluator user role.
+    # Evaluators will be users in charge of defining the monetary cost of a
     # proposal.
-    class ValuationAssignment < ApplicationRecord
+    class EvaluationAssignment < ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
 
       belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: "Decidim::Proposals::Proposal",
                             counter_cache: true
-      belongs_to :valuator_role, polymorphic: true
+      belongs_to :evaluator_role, polymorphic: true
 
       def self.log_presenter_class_for(_log)
-        Decidim::Proposals::AdminLog::ValuationAssignmentPresenter
+        Decidim::Proposals::AdminLog::EvaluationAssignmentPresenter
       end
 
-      def valuator
-        valuator_role.user
+      def evaluator
+        evaluator_role.user
       end
     end
   end

data/app/models/decidim/proposals/proposal.rb

@@ -24,12 +24,13 @@ module Decidim
       include Decidim::Amendable
       include Decidim::NewsletterParticipant
       include Decidim::Randomable
-      include Decidim::Endorsable
-      include Decidim::Proposals::Valuatable
+      include Decidim::Likeable
+      include Decidim::Proposals::Evaluable
       include Decidim::TranslatableResource
       include Decidim::TranslatableAttributes
       include Decidim::FilterableResource
       include Decidim::SoftDeletable
+      include Decidim::Publicable
 
       def assign_state(token)
         proposal_state = Decidim::Proposals::ProposalState.where(component:, token:).first
@@ -94,7 +95,6 @@ module Decidim
       scope :not_withdrawn, -> { where(withdrawn_at: nil) }
 
       scope :drafts, -> { where(published_at: nil) }
-      scope :published, -> { where.not(published_at: nil) }
       scope :order_by_most_recent, -> { order(created_at: :desc) }
 
       scope :with_availability, lambda { |state_key|
@@ -121,12 +121,12 @@ module Decidim
         includes(:votes).where(decidim_proposals_proposal_votes: { decidim_author_id: user })
       }
 
-      scope :sort_by_valuation_assignments_count_asc, lambda {
-        order(valuation_assignments_count: :asc)
+      scope :sort_by_evaluation_assignments_count_asc, lambda {
+        order(evaluation_assignments_count: :asc)
       }
 
-      scope :sort_by_valuation_assignments_count_desc, lambda {
-        order(valuation_assignments_count: :desc)
+      scope :sort_by_evaluation_assignments_count_desc, lambda {
+        order(evaluation_assignments_count: :desc)
       }
 
       scope :state_eq, lambda { |state|
@@ -158,11 +158,11 @@ module Decidim
         scoped_query
       }
 
-      def self.with_valuation_assigned_to(user, space)
-        valuator_roles = space.user_roles(:valuator).where(user:)
+      def self.with_evaluation_assigned_to(user, space)
+        evaluator_roles = space.user_roles(:evaluator).where(user:)
 
-        includes(:valuation_assignments)
-          .where(decidim_proposals_valuation_assignments: { valuator_role_id: valuator_roles })
+        includes(:evaluation_assignments)
+          .where(decidim_proposals_evaluation_assignments: { evaluator_role_id: evaluator_roles })
       end
 
       acts_as_list scope: :decidim_component_id
@@ -193,7 +193,7 @@ module Decidim
 
       def self.retrieve_proposals_for(component)
         Decidim::Proposals::Proposal.where(component:).joins(:coauthorships)
-                                    .includes(:votes, :endorsements)
+                                    .includes(:votes, :likes)
                                     .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
                                     .not_hidden
                                     .published
@@ -207,13 +207,13 @@ module Decidim
 
         participants_has_voted_ids = Decidim::Proposals::ProposalVote.joins(:proposal).where(proposal: proposals).joins(:author).map(&:decidim_author_id).flatten.compact.uniq
 
-        endorsements_participants_ids = Decidim::Endorsement.where(resource: proposals)
-                                                            .where(decidim_author_type: "Decidim::UserBaseEntity")
-                                                            .pluck(:decidim_author_id).to_a.compact.uniq
+        likes_participants_ids = Decidim::Like.where(resource: proposals)
+                                              .where(decidim_author_type: "Decidim::UserBaseEntity")
+                                              .pluck(:decidim_author_id).to_a.compact.uniq
 
         commentators_ids = Decidim::Comments::Comment.user_commentators_ids_in(proposals)
 
-        (endorsements_participants_ids + participants_has_voted_ids + coauthors_recipients_ids + commentators_ids).flatten.compact.uniq
+        (likes_participants_ids + participants_has_voted_ids + coauthors_recipients_ids + commentators_ids).flatten.compact.uniq
       end
 
       # Public: Updates the vote count of this proposal.
@@ -232,13 +232,6 @@ module Decidim
         ProposalVote.where(proposal: self, author: user).any?
       end
 
-      # Public: Checks if the proposal has been published or not.
-      #
-      # Returns Boolean.
-      def published?
-        published_at.present?
-      end
-
       # Public: Returns the published state of the proposal.
       #
       # Returns Boolean.
@@ -249,9 +242,6 @@ module Decidim
         proposal_state&.token || "not_answered"
       end
 
-      # This is only used to define the setter, as the getter will be overridden below.
-      alias_attribute :internal_state, :state
-
       # Public: Returns the internal state of the proposal.
       #
       # Returns Boolean.
@@ -386,13 +376,13 @@ module Decidim
         ProposalSearch.new(self, params, options)
       end
 
-      # method to filter by assigned valuator role ID
-      def self.valuator_role_ids_has(value)
+      # method to filter by assigned evaluator role ID
+      def self.evaluator_role_ids_has(value)
         query = <<-SQL.squish
         :value = any(
-          (SELECT decidim_proposals_valuation_assignments.valuator_role_id
-          FROM decidim_proposals_valuation_assignments
-          WHERE decidim_proposals_valuation_assignments.decidim_proposal_id = decidim_proposals_proposals.id
+          (SELECT decidim_proposals_evaluation_assignments.evaluator_role_id
+          FROM decidim_proposals_evaluation_assignments
+          WHERE decidim_proposals_evaluation_assignments.decidim_proposal_id = decidim_proposals_proposals.id
           )
         )
         SQL
@@ -400,7 +390,7 @@ module Decidim
       end
 
       def self.ransackable_scopes(_auth_object = nil)
-        [:with_any_origin, :with_any_state, :state_eq, :voted_by, :coauthored_by, :related_to, :with_any_taxonomies, :valuator_role_ids_has]
+        [:with_any_origin, :with_any_state, :state_eq, :voted_by, :coauthored_by, :related_to, :with_any_taxonomies, :evaluator_role_ids_has]
       end
 
       # Create i18n ransackers for :title and :body.

data/app/packs/entrypoints/decidim_proposals_admin.js

@@ -1,2 +1,3 @@
 import "src/decidim/proposals/admin/proposals"
 import "src/decidim/proposals/admin/proposals_form"
+import "src/decidim/proposals/admin/proposals_merge"

data/app/packs/src/decidim/proposals/add_proposal.js

@@ -1,7 +1,7 @@
 import attachGeocoding from "src/decidim/geocoding/attach_input"
 import getCoordinateInputName from "src/decidim/geocoding/coordinate_input";
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   const $map = $("#address_map");
   const $addressInputField = $("[data-decidim-geocoding]");
 

data/app/packs/src/decidim/proposals/admin/proposals.js

@@ -4,7 +4,12 @@
 
 import TomSelect from "tom-select/dist/cjs/tom-select.popular";
 
-$(() => {
+document.addEventListener("turbo:load", () => {
+  let isMergeProposalsClicked = false;
+  $('button[data-action="merge-proposals"]').on("click", function() {
+    isMergeProposalsClicked = true;
+  });
+
   const selectedProposalsCount = function() {
     return $(".table-list .js-check-all-proposal:checked").length
   }
@@ -24,8 +29,8 @@ $(() => {
 
     if (selectedProposals === 0) {
       $("#js-selected-proposals-count").text("")
-      $("#js-assign-proposals-to-valuator-actions").addClass("hide");
-      $("#js-unassign-proposals-from-valuator-actions").addClass("hide");
+      $("#js-assign-proposals-to-evaluator-actions").addClass("hide");
+      $("#js-unassign-proposals-from-evaluator-actions").addClass("hide");
       $("#js-taxonomy-change-proposals-actions").addClass("hide");
     } else {
       $("#js-selected-proposals-count").text(selectedProposals);
@@ -72,10 +77,16 @@ $(() => {
   }
 
   const showOtherActionsButtons = function() {
+    if (isMergeProposalsClicked) {
+      return;
+    }
     $("#js-other-actions-wrapper").removeClass("hide");
   }
 
   const hideOtherActionsButtons = function() {
+    if (isMergeProposalsClicked) {
+      return;
+    }
     $("#js-other-actions-wrapper").addClass("hide");
   }
 
@@ -98,14 +109,14 @@ $(() => {
     hideBulkActionForms();
     $("#js-bulk-actions-button").addClass("hide");
 
-    $("#js-bulk-actions-dropdown ul li button").click(function (e) {
+    $("#js-bulk-actions-dropdown li button").click(function (e) {
       $("#js-bulk-actions-dropdown").removeClass("is-open");
       hideBulkActionForms();
 
       let action = $(e.target).data("action");
       const panelActions = [
-        "assign-proposals-to-valuator",
-        "unassign-proposals-from-valuator",
+        "assign-proposals-to-evaluator",
+        "unassign-proposals-from-evaluator",
         "taxonomy-change-proposals"
       ];
 
@@ -125,7 +136,7 @@ $(() => {
         });
 
         $(`#js-${action}-actions`).removeClass("hide");
-        hideBulkActionsButton(true);
+        hideBulkActionsButton(!isMergeProposalsClicked);
         hideOtherActionsButtons();
       }
     });
@@ -184,12 +195,12 @@ $(() => {
   }
 });
 
-document.addEventListener("DOMContentLoaded", () => {
-  const valuatorMultiselectContainers = document.querySelectorAll(
-    ".js-valuator-multiselect"
+document.addEventListener("turbo:load", () => {
+  const evaluatorMultiselectContainers = document.querySelectorAll(
+    ".js-evaluator-multiselect"
   );
 
-  valuatorMultiselectContainers.forEach((container) => {
+  evaluatorMultiselectContainers.forEach((container) => {
     const config = {
       plugins: ["remove_button", "dropdown_input"],
       allowEmptyOption: true

data/app/packs/src/decidim/proposals/admin/proposals_form.js

@@ -1,6 +1,6 @@
 import attachGeocoding from "src/decidim/geocoding/attach_input"
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   const $form = $(".proposal_form_admin");
 
   if ($form.length > 0) {

data/app/packs/src/decidim/proposals/admin/proposals_merge.js

@@ -0,0 +1,92 @@
+import { createDialog } from "src/decidim/a11y"
+import createEditor from "src/decidim/editor";
+import attachGeocoding from "src/decidim/geocoding/attach_input";
+import { initializeUploadFields } from "src/decidim/direct_uploads/upload_field";
+import { initializeReverseGeocoding } from "src/decidim/geocoding/reverse_geocoding"
+
+document.addEventListener("decidim:loaded", () => {
+  document.querySelectorAll('button[data-action="merge-proposals"]').forEach((button) => {
+    const url = button.dataset.mergeUrl;
+    const drawer = window.Decidim.currentDialogs[button.dataset.mergeDialog];
+    const container = drawer.dialog.querySelector("#merge-proposals-actions");
+
+    // Handles changes on the form
+    const activateDrawerForm = () => {
+      const saveForm = drawer.dialog.querySelector("#form-merge-proposals");
+
+      // Handles editor initialization
+      saveForm.querySelectorAll(".editor-container").forEach((element) => createEditor(element));
+      const form = document.querySelector(".proposals_merge_form_admin");
+
+      // Handles meeting checkbox
+      if (form) {
+        const proposalCreatedInMeeting = form.querySelector("#proposals_merge_created_in_meeting");
+        const proposalMeeting = form.querySelector("#proposals_merge_meeting");
+
+        const toggleDisabledHiddenFields = () => {
+          const enabledMeeting = proposalCreatedInMeeting.checked;
+          proposalMeeting.querySelector("select").setAttribute("disabled", "disabled");
+
+          proposalMeeting.classList.add("hidden");
+
+          if (enabledMeeting) {
+            proposalMeeting.querySelector("select").removeAttribute("disabled");
+            proposalMeeting.classList.remove("hidden");
+          }
+        };
+
+        proposalCreatedInMeeting.addEventListener("change", toggleDisabledHiddenFields);
+        toggleDisabledHiddenFields();
+      }
+
+      // Handles address input (requires jQuery for the moment)
+      attachGeocoding($(document.getElementById("proposals_merge_address")));
+
+      // Handles address reverse_geocoding initialization
+      initializeReverseGeocoding()
+
+      // Handles upload files initialization
+      saveForm.querySelectorAll("[data-dialog]").forEach((component) => createDialog(component));
+      initializeUploadFields(saveForm.querySelectorAll("button[data-upload]"));
+
+      // Handles form errors and success
+      if (saveForm) {
+        saveForm.addEventListener("ajax:success", (event) => {
+          const response = event.detail[0];
+
+          if (response.status === "ok") {
+            window.location.reload();
+          } else {
+            window.location.href = response.redirect_url;
+          }
+        });
+
+        saveForm.addEventListener("ajax:error", (event) => {
+          const response = event.detail[2];
+          container.innerHTML = response.responseText;
+          activateDrawerForm();
+        });
+      }
+    }
+
+    const fetchUrl = (urlToFetch) => {
+      container.classList.add("spinner-container");
+      fetch(urlToFetch).then((response) => response.text()).then((html) => {
+        container.innerHTML = html;
+        container.classList.remove("spinner-container");
+        // We still need foundation for form validations
+        $(container).foundation();
+        activateDrawerForm();
+      });
+    };
+
+    button.addEventListener("click", () => {
+      const selectedProposals = Array.from(document.querySelectorAll(".js-check-all-proposal:checked")).map((checkbox) => checkbox.value);
+      const uniqueProposals = [...new Set(selectedProposals)];
+
+      const queryParams = uniqueProposals.map((id) => `proposal_ids[]=${encodeURIComponent(id)}`).join("&")
+      fetchUrl(`${url}?${queryParams}`);
+      drawer.open();
+    });
+  })
+});

data/app/packs/src/decidim/proposals/choose_proposals.js

@@ -1,6 +1,6 @@
 import TomSelect from "tom-select/dist/cjs/tom-select.popular";
 
-document.addEventListener("DOMContentLoaded", () => {
+document.addEventListener("turbo:load", () => {
   const tagContainers = document.querySelectorAll("#proposals_list");
   tagContainers.forEach((container) => {
     const { tmName, tmItems, tmNoResults } = container.dataset

data/app/packs/src/decidim/proposals/exit_handler.js

@@ -6,7 +6,7 @@ const allowExitFrom = (el) => {
   return false;
 };
 
-document.addEventListener("DOMContentLoaded", () => {
+document.addEventListener("turbo:load", () => {
   const exitNotification = document.getElementById("exit-proposal-notification");
   const exitLink = document.getElementById("exit-proposal-notification-link");
   if (!exitLink) {

data/app/packs/src/decidim/proposals/utils.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-invalid-this */
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   $("#vote_button").mouseover(function () {
     $(this).text($(this).data("replace"));
   });

data/app/packs/stylesheets/decidim/proposals/proposals.scss

@@ -1,4 +1,4 @@
-@import "tom-select/dist/scss/tom-select";
+@use "tom-select/dist/scss/tom-select";
 
 .proposal-list {
   &__aside {
@@ -405,6 +405,34 @@
   }
 }
 
+#form-merge-proposals {
+  .custom-inputs {
+    input {
+      @apply mt-0;
+    }
+  }
+
+  .upload-modal__files-container {
+    label {
+      @apply mb-0;
+    }
+
+    button {
+      @apply mt-0;
+    }
+  }
+}
+
+.form__wrapper,
+.form-proposals-merge-styles {
+  .proposal-field-custom-style {
+    & label:not(&-checkbox-label),
+    &-block label:not(&-checkbox-label) {
+      @apply font-normal text-sm;
+    }
+  }
+}
+
 .proposal__aside-vote {
   button[disabled] {
     @apply bg-[var(--secondary)] opacity-50 text-white border-current cursor-not-allowed;

data/app/permissions/decidim/proposals/admin/permissions.rb

@@ -8,12 +8,12 @@ module Decidim
           # The public part needs to be implemented yet
           return permission_action if permission_action.scope != :admin
 
-          # Valuators can only perform these actions
-          if user_is_valuator?
-            if valuator_assigned_to_proposal?
+          # Evaluators can only perform these actions
+          if user_is_evaluator?
+            if evaluator_assigned_to_proposal?
               can_create_proposal_note?
               can_create_proposal_answer?
-              can_assign_valuator_to_proposal?
+              can_assign_evaluator_to_proposal?
             end
             can_export_proposals?
 
@@ -45,11 +45,11 @@ module Decidim
           # Every user allowed by the space can split proposals to another component
           allow! if permission_action.subject == :proposals && permission_action.action == :split
 
-          # Every user allowed by the space can assign proposals to a valuator
-          can_assign_valuator_to_proposal?
+          # Every user allowed by the space can assign proposals to a evaluator
+          can_assign_evaluator_to_proposal?
 
-          # Every user allowed by the space can unassign a valuator from proposals
-          can_unassign_valuator_from_proposals?
+          # Every user allowed by the space can unassign a evaluator from proposals
+          can_unassign_evaluator_from_proposals?
 
           # Only admin users can publish many answers at once
           toggle_allow(user.admin?) if permission_action.subject == :proposals && permission_action.action == :publish_answers
@@ -80,20 +80,20 @@ module Decidim
           @proposal ||= context.fetch(:proposal, nil)
         end
 
-        def user_valuator_role
-          @user_valuator_role ||= space.user_roles(:valuator).find_by(user:)
+        def user_evaluator_role
+          @user_evaluator_role ||= space.user_roles(:evaluator).find_by(user:)
         end
 
-        def user_is_valuator?
+        def user_is_evaluator?
           return if user.admin?
 
-          user_valuator_role.present?
+          user_evaluator_role.present?
         end
 
-        def valuator_assigned_to_proposal?
-          @valuator_assigned_to_proposal ||=
-            Decidim::Proposals::ValuationAssignment
-            .where(proposal:, valuator_role: user_valuator_role)
+        def evaluator_assigned_to_proposal?
+          @evaluator_assigned_to_proposal ||=
+            Decidim::Proposals::EvaluationAssignment
+            .where(proposal:, evaluator_role: user_evaluator_role)
             .any?
         end
 
@@ -142,12 +142,12 @@ module Decidim
           toggle_allow(admin_proposal_answering_is_enabled?) if permission_action.subject == :proposal_answer
         end
 
-        def can_unassign_valuator_from_proposals?
-          allow! if permission_action.subject == :proposals && permission_action.action == :unassign_from_valuator
+        def can_unassign_evaluator_from_proposals?
+          allow! if permission_action.subject == :proposals && permission_action.action == :unassign_from_evaluator
         end
 
-        def can_assign_valuator_to_proposal?
-          allow! if permission_action.subject == :proposals && permission_action.action == :assign_to_valuator
+        def can_assign_evaluator_to_proposal?
+          allow! if permission_action.subject == :proposals && permission_action.action == :assign_to_evaluator
         end
 
         def can_export_proposals?