thelonius/phoenix-ausblick
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix issue with "Save and edit"

Browse Source
This commit is contained in:
Thelonius Kort
2023-01-23 15:40:05 +01:00
parent 2db0ff06ac
commit 0089d22da4
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/outlook_web/live/translation_live/form_component.ex
View File

@ -164,7 +164,7 @@ defmodule OutlookWeb.TranslationLive.FormComponent do
{:noreply, {:noreply,
socket socket
|> put_flash(:info, "Translation updated successfully") |> put_flash(:info, "Translation updated successfully")
|> continue_edit(params)} |> continue_edit(:edit, params)}
{:error, %Ecto.Changeset{} = changeset} -> {:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, :changeset, changeset)} {:noreply, assign(socket, :changeset, changeset)}
@ -173,22 +173,24 @@ defmodule OutlookWeb.TranslationLive.FormComponent do
defp save_translation(socket, :new, %{"translation" => translation_params} = params) do defp save_translation(socket, :new, %{"translation" => translation_params} = params) do
case Translations.create_translation(translation_params) do case Translations.create_translation(translation_params) do
{:ok, _translation} -> {:ok, translation} ->
{:noreply, {:noreply,
socket socket
|> put_flash(:info, "Translation created successfully") |> put_flash(:info, "Translation created successfully")
|> continue_edit(params)} |> continue_edit(:new, Map.put(params,"id", translation.id))}
{:error, %Ecto.Changeset{} = changeset} -> {:error, %Ecto.Changeset{} = changeset} ->
{:noreply, assign(socket, changeset: changeset)} {:noreply, assign(socket, changeset: changeset)}
end end
end end
defp continue_edit(socket, %{"continue_edit" => "true"}) do defp continue_edit(socket, :edit, %{"continue_edit" => "true"}) do
socket socket
|> assign(:action, :edit)
end end
defp continue_edit(socket, %{"continue_edit" => "false"}) do defp continue_edit(socket, :new, %{"continue_edit" => "true"} = params) do
socket |> push_patch(to: ~p(/translations/#{params["id"]}/edit))
end
defp continue_edit(socket, _, %{"continue_edit" => "false"}) do
socket |> push_navigate(to: socket.assigns.navigate) socket |> push_navigate(to: socket.assigns.navigate)
end end

12
lib/outlook_web/live/translation_live/new_edit.ex
View File

@ -24,7 +24,7 @@ defmodule OutlookWeb.TranslationLive.NewEdit do
end end
@impl true @impl true
def mount(%{"article_id" => article_id} = _params, _session, socket) when socket.assigns.live_action == :new do def handle_params(%{"article_id" => article_id} = _params, _session, socket) when socket.assigns.live_action == :new do
socket = socket socket = socket
|> assign_new(:translation, fn -> |> assign_new(:translation, fn ->
%Translation{ %Translation{
@ -33,15 +33,15 @@ defmodule OutlookWeb.TranslationLive.NewEdit do
} }
end) end)
|> common_assigns() |> common_assigns()
{:ok, assign_new(socket, :translation_content, fn -> {:noreply, assign_new(socket, :translation_content, fn ->
Basic.internal_tree_to_tunit_map(socket.assigns.translation.article.content) end)} Basic.internal_tree_to_tunit_map(socket.assigns.translation.article.content) end)}
end end
def mount(%{"id" => id} = _params, _session, socket) when socket.assigns.live_action == :edit do def handle_params(%{"id" => id} = _params, _session, socket) when socket.assigns.live_action == :edit do
socket = socket socket = socket
|> assign_new(:translation, fn -> Translations.get_translation!(id) end) |> assign(:translation, Translations.get_translation!(id))
|> common_assigns() |> common_assigns()
{:ok, assign_new(socket, :translation_content, fn -> socket.assigns.translation.content end)} {:noreply, assign(socket, :translation_content, socket.assigns.translation.content)}
end end
defp get_article(article_id) do defp get_article(article_id) do