diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 863c00be2..1c1e8c664 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -5,7 +5,7 @@ module MergeRequestsHelper def request_details(merge_request) [ - { label: "Requester", value: display_value_or_placeholder(merge_request.requestor&.name) }, + { label: "Requester", value: display_value_or_placeholder(merge_request.requester&.name) }, { label: "Helpdesk ticket", value: merge_request.helpdesk_ticket.present? ? link_to("#{merge_request.helpdesk_ticket} (opens in a new tab)", "https://dluhcdigital.atlassian.net/browse/#{merge_request.helpdesk_ticket}", target: "_blank", rel: "noopener noreferrer") : display_value_or_placeholder(nil), action: merge_request.status == "request_merged" ? nil : { text: "Change", href: "#", visually_hidden_text: "helpdesk ticket" } }, { label: "Status", value: status_tag(merge_request.status) }, ] diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index c32e16f9c..ec844576b 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -3,7 +3,7 @@ class MergeRequest < ApplicationRecord has_many :merge_request_organisations belongs_to :absorbing_organisation, class_name: "Organisation", optional: true has_many :merging_organisations, through: :merge_request_organisations, source: :merging_organisation - belongs_to :requestor, class_name: "User", foreign_key: "requester_id", optional: true + belongs_to :requester, class_name: "User", optional: true validate :organisation_name_uniqueness, if: :new_organisation_name validates :new_telephone_number, presence: true, if: -> { telephone_number_correct == false }