From 136bc4cbb959500956bfba808b2e637c075febc4 Mon Sep 17 00:00:00 2001 From: Dmitry Popov Date: Sun, 19 Oct 2025 12:03:16 +0200 Subject: [PATCH] feat(Core): Added map roles settings for copy/paste --- lib/wanderer_app/repositories/map_repo.ex | 6 +++--- lib/wanderer_app_web/live/maps/maps_live.ex | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/wanderer_app/repositories/map_repo.ex b/lib/wanderer_app/repositories/map_repo.ex index a68c68aa..765b2b6f 100644 --- a/lib/wanderer_app/repositories/map_repo.ex +++ b/lib/wanderer_app/repositories/map_repo.ex @@ -8,8 +8,8 @@ defmodule WandererApp.MapRepo do "show_linked_signature_id_temp_name" => "false", "show_temp_system_name" => "false", "restrict_offline_showing" => "false", - "allowed_copy_for" => "admin", - "allowed_paste_for" => "member" + "allowed_copy_for" => "admin_map", + "allowed_paste_for" => "add_system" } def get(map_id, relationships \\ []) do @@ -59,7 +59,7 @@ defmodule WandererApp.MapRepo do |> WandererApp.Api.Map.update_options(%{options: Jason.encode!(options)}) def options_to_form_data(%{options: options} = _map_options) when not is_nil(options), - do: {:ok, Jason.decode!(options)} + do: {:ok, @default_map_options |> Map.merge(Jason.decode!(options))} def options_to_form_data(_), do: {:ok, @default_map_options} diff --git a/lib/wanderer_app_web/live/maps/maps_live.ex b/lib/wanderer_app_web/live/maps/maps_live.ex index 609f5718..1bef0814 100644 --- a/lib/wanderer_app_web/live/maps/maps_live.ex +++ b/lib/wanderer_app_web/live/maps/maps_live.ex @@ -171,14 +171,14 @@ defmodule WandererAppWeb.MapsLive do {"Top To Bottom", "top_to_bottom"} ], allowed_copy_for_options: [ - {"Administrators", "admin"}, - {"Managers", "manager"}, - {"Members", "member"} + {"Administrators", "admin_map"}, + {"Managers", "manage_map"}, + {"Members", "add_system"} ], allowed_paste_for_options: [ - {"Members", "member"}, - {"Administrators", "admin"}, - {"Managers", "manager"} + {"Members", "add_system"}, + {"Administrators", "admin_map"}, + {"Managers", "manage_map"} ] ) |> allow_upload(:settings,