diff --git a/lib/memex/contexts.ex b/lib/memex/contexts.ex index 2b800b5..de282dc 100644 --- a/lib/memex/contexts.ex +++ b/lib/memex/contexts.ex @@ -229,10 +229,10 @@ defmodule Memex.Contexts do context |> Context.update_changeset(attrs, user) end - @spec is_owner_or_admin?(Context.t(), User.t()) :: boolean() - def is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true - def is_owner_or_admin?(_context, %{role: :admin}), do: true - def is_owner_or_admin?(_context, _other_user), do: false + @spec owner_or_admin?(Context.t(), User.t()) :: boolean() + def owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true + def owner_or_admin?(_context, %{role: :admin}), do: true + def owner_or_admin?(_context, _other_user), do: false @spec is_owner?(Context.t(), User.t()) :: boolean() def is_owner?(%{user_id: user_id}, %{id: user_id}), do: true diff --git a/lib/memex/notes.ex b/lib/memex/notes.ex index c8c07eb..f9fa677 100644 --- a/lib/memex/notes.ex +++ b/lib/memex/notes.ex @@ -229,10 +229,10 @@ defmodule Memex.Notes do note |> Note.update_changeset(attrs, user) end - @spec is_owner_or_admin?(Note.t(), User.t()) :: boolean() - def is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true - def is_owner_or_admin?(_context, %{role: :admin}), do: true - def is_owner_or_admin?(_context, _other_user), do: false + @spec owner_or_admin?(Note.t(), User.t()) :: boolean() + def owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true + def owner_or_admin?(_context, %{role: :admin}), do: true + def owner_or_admin?(_context, _other_user), do: false @spec is_owner?(Note.t(), User.t()) :: boolean() def is_owner?(%{user_id: user_id}, %{id: user_id}), do: true diff --git a/lib/memex/pipelines.ex b/lib/memex/pipelines.ex index 988933c..bbcd3bf 100644 --- a/lib/memex/pipelines.ex +++ b/lib/memex/pipelines.ex @@ -231,10 +231,10 @@ defmodule Memex.Pipelines do pipeline |> Pipeline.update_changeset(attrs, user) end - @spec is_owner_or_admin?(Pipeline.t(), User.t()) :: boolean() - def is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true - def is_owner_or_admin?(_context, %{role: :admin}), do: true - def is_owner_or_admin?(_context, _other_user), do: false + @spec owner_or_admin?(Pipeline.t(), User.t()) :: boolean() + def owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true + def owner_or_admin?(_context, %{role: :admin}), do: true + def owner_or_admin?(_context, _other_user), do: false @spec is_owner?(Pipeline.t(), User.t()) :: boolean() def is_owner?(%{user_id: user_id}, %{id: user_id}), do: true diff --git a/lib/memex_web/live/context_live/index.html.heex b/lib/memex_web/live/context_live/index.html.heex index 3f681ff..e9542e6 100644 --- a/lib/memex_web/live/context_live/index.html.heex +++ b/lib/memex_web/live/context_live/index.html.heex @@ -40,7 +40,7 @@ <%= dgettext("actions", "edit") %> <.link - :if={Contexts.is_owner_or_admin?(context, @current_user)} + :if={Contexts.owner_or_admin?(context, @current_user)} href="#" phx-click="delete" phx-value-id={context.id} diff --git a/lib/memex_web/live/context_live/show.html.heex b/lib/memex_web/live/context_live/show.html.heex index deb0c8d..35a5ef1 100644 --- a/lib/memex_web/live/context_live/show.html.heex +++ b/lib/memex_web/live/context_live/show.html.heex @@ -24,7 +24,7 @@ <%= dgettext("actions", "edit") %>