diff --git a/app/models/user_team.rb b/app/models/user_team.rb
index 77a1c4320..f6d703f48 100644
--- a/app/models/user_team.rb
+++ b/app/models/user_team.rb
@@ -77,6 +77,15 @@ class UserTeam < ApplicationRecord
protocol.save
end
+ # Make new owner author of all inventory items that were added
+ # by departing user and belong to this team.
+ repository_rows =
+ RepositoryRow.joins(:repository)
+ .where('repositories.team_id = ? and repository_rows.created_by_id = ?', team, user)
+ repository_rows.find_each do |repository_row|
+ repository_row.update(created_by: new_owner)
+ end
+
super()
end
diff --git a/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb b/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb
index 7f5a68711..b77e2f226 100644
--- a/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb
+++ b/app/views/users/settings/user_teams/_destroy_user_team_modal_body.html.erb
@@ -15,6 +15,7 @@
<%= t("users.settings.user_teams.destroy_uo_alert_line_1") %>
<%= t("users.settings.user_teams.destroy_uo_alert_line_2").html_safe %>
<%= t("users.settings.user_teams.destroy_uo_alert_line_3") %>
+ <%= t("users.settings.user_teams.destroy_uo_alert_line_4") %>
<% end %>
diff --git a/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb b/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb
index 9e1c023c9..3701a7aa3 100644
--- a/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb
+++ b/app/views/users/settings/user_teams/_leave_user_team_modal_body.html.erb
@@ -13,6 +13,7 @@
<%= t("users.settings.user_teams.leave_uo_alert_line_1") %>
<%= t("users.settings.user_teams.leave_uo_alert_line_2").html_safe %>
<%= t("users.settings.user_teams.leave_uo_alert_line_3")%>
+ <%= t("users.settings.user_teams.leave_uo_alert_line_4")%>
<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 86db7e9b3..081fceff9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1497,14 +1497,16 @@ en:
leave_uo_alert_heading: "Leaving team has following consequences:"
leave_uo_alert_line_1: "you will lose access to all content belonging to the team (including projects, tasks, protocols and activities);"
leave_uo_alert_line_2: "all projects in the team where you were the sole Owner will receive a new owner from the team administrators;"
- leave_uo_alert_line_3: "all repository protocols in the team belonging to you will be reassigned onto a new owner from team administrators."
+ leave_uo_alert_line_3: "all repository protocols in the team belonging to you will be reassigned onto a new owner from team administrators;"
+ leave_uo_alert_line_4: "all inventory items in the team added by you will be reassigned onto a new owner from team administrators."
leave_uo_confirm: "Leave"
destroy_uo_heading: "Remove user %{user} from team %{team}"
destroy_uo_message: "Are you sure you wish to remove user %{user} from team %{team}?"
destroy_uo_alert_heading: "Removing user from team has following consequences:"
destroy_uo_alert_line_1: "user will lose access to all content belonging to the team (including projects, tasks, protocols and activities);"
destroy_uo_alert_line_2: "all projects in the team where user was the sole Owner will be reassigned onto you as a new owner;"
- destroy_uo_alert_line_3: "all repository protocols in the team belonging to user will be reassigned onto you."
+ destroy_uo_alert_line_3: "all repository protocols in the team belonging to user will be reassigned onto you;"
+ destroy_uo_alert_line_4: "all inventory items in the team added by user will be reassigned onto you."
destroy_uo_confirm: "Remove"
leave_flash: "Successfuly left team %{team}."