scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-06 20:05:55 +08:00
Code Issues Projects Releases Packages Wiki Activity

Add links to items in linked/unlinked related activities [SCI-9718] (#6921)

Browse source
This commit is contained in:
Soufiane 2024-01-10 15:32:01 +01:00 • committed by GitHub
parent fd5d44705c
commit a7dd9d49b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/repository_row_connections_controller.rb
View file

@ -51,8 +51,8 @@ class RepositoryRowConnectionsController < ApplicationController
build_connection(linked_repository_row)
log_activity(:inventory_item_relationships_linked,
@repository_row.repository,
{ inventory_item: @repository_row.name,
linked_inventory_item: linked_repository_row.name,
{ repository_row: @repository_row.id,
repository_row_linked: linked_repository_row.id,
relationship_type: @relation_type == 'parent' ? 'parent' : 'child' })
end
@ -69,12 +69,12 @@ class RepositoryRowConnectionsController < ApplicationController
def destroy
RepositoryRowConnection.transaction do
connection = @repository_row.parent_connections.or(@repository_row.child_connections).find(params[:id])
unlinked_item = connection.parent?(@repository_row) ? connection.child : connection.parent
unlinked_repository_row = connection.parent?(@repository_row) ? connection.child : connection.parent
log_activity(:inventory_item_relationships_unlinked,
@repository_row.repository,
{ inventory_item: @repository_row.name,
unlinked_inventory_item: unlinked_item.name })
{ repository_row: @repository_row.id,
repository_row_unlinked: unlinked_repository_row.id })
connection.destroy!
head :no_content

4
config/locales/global_activities/en.yml
View file

@ -155,8 +155,8 @@ en:
edit_item_inventory_html: "%{user} edited inventory item %{repository_row}."
delete_item_inventory_html: "%{user} deleted inventory item %{repository_row}."
edit_item_field_inventory_html: "%{user} edited %{repository_column} on inventory item %{repository_row}."
inventory_item_relationships_linked_html: "%{user} link %{repository_row1} as a %{relationship_type} to %{repository_row2}."
inventory_item_relationships_unlinked_html: "%{user} unlinked %{repository_row1} and %{repository_row2}."
inventory_item_relationships_linked_html: "%{user} link %{repository_row_linked} as a %{relationship_type} to %{repository_row}."
inventory_item_relationships_unlinked_html: "%{user} unlinked %{repository_row} and %{repository_row_unlinked}."
archive_inventory_item_html: "%{user} archived inventory item %{repository_row}."
restore_inventory_item_html: "%{user} restored inventory item %{repository_row}."
create_column_inventory_html: "%{user} created column %{repository_column} in inventory %{repository}."