shibao/memEx
1
1
Fork 0
Code Issues 1 Pull Requests Projects Releases 21 Wiki Activity

move is_owner? and is_owner_or_admin? to context methods

Browse Source
This commit is contained in:
shibao
2023-03-18 23:09:36 -04:00
parent a0d3fb09f3
commit 50b7f8f9b6
18 changed files with 62 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/memex_web/live/pipeline_live/index.ex
View File

@ -1,6 +1,6 @@
defmodule MemexWeb.PipelineLive.Index do
use MemexWeb, :live_view
alias Memex.{Accounts.User, Pipelines, Pipelines.Pipeline}
alias Memex.{Pipelines, Pipelines.Pipeline}
@impl true
def mount(%{"search" => search}, _session, socket) do
@ -76,13 +76,4 @@ defmodule MemexWeb.PipelineLive.Index do
defp display_pipelines(%{assigns: %{search: search}} = socket) do
socket |> assign(pipelines: Pipelines.list_public_pipelines(search))
end
@spec is_owner_or_admin?(Pipeline.t(), User.t()) :: boolean()
defp is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true
defp is_owner_or_admin?(_context, %{role: :admin}), do: true
defp is_owner_or_admin?(_context, _other_user), do: false
@spec is_owner?(Pipeline.t(), User.t()) :: boolean()
defp is_owner?(%{user_id: user_id}, %{id: user_id}), do: true
defp is_owner?(_context, _other_user), do: false
end

4
lib/memex_web/live/pipeline_live/index.html.heex
View File

@ -32,14 +32,14 @@
>
<:actions :let={pipeline}>
<.link
:if={is_owner?(pipeline, @current_user)}
:if={Pipelines.is_owner?(pipeline, @current_user)}
patch={Routes.pipeline_index_path(@socket, :edit, pipeline.slug)}
aria-label={dgettext("actions", "edit %{pipeline_slug}", pipeline_slug: pipeline.slug)}
>
<%= dgettext("actions", "edit") %>
</.link>
<.link
:if={is_owner_or_admin?(pipeline, @current_user)}
:if={Pipelines.is_owner_or_admin?(pipeline, @current_user)}
href="#"
phx-click="delete"
phx-value-id={pipeline.id}

12
lib/memex_web/live/pipeline_live/show.ex
View File

@ -1,7 +1,6 @@
defmodule MemexWeb.PipelineLive.Show do
use MemexWeb, :live_view
alias Memex.{Accounts.User, Pipelines}
alias Memex.Pipelines.{Pipeline, Steps, Steps.Step}
alias Memex.{Pipelines, Pipelines.Steps, Pipelines.Steps.Step}
@impl true
def mount(_params, _session, socket) do
@ -122,13 +121,4 @@ defmodule MemexWeb.PipelineLive.Show do
do: gettext("edit %{slug}", slug: slug)
defp page_title(:add_step, %{slug: slug}), do: gettext("add step to %{slug}", slug: slug)
@spec is_owner_or_admin?(Pipeline.t(), User.t()) :: boolean()
defp is_owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true
defp is_owner_or_admin?(_context, %{role: :admin}), do: true
defp is_owner_or_admin?(_context, _other_user), do: false
@spec is_owner?(Pipeline.t(), User.t()) :: boolean()
defp is_owner?(%{user_id: user_id}, %{id: user_id}), do: true
defp is_owner?(_context, _other_user), do: false
end

8
lib/memex_web/live/pipeline_live/show.html.heex
View File

@ -32,14 +32,14 @@
<%= dgettext("actions", "back") %>
</.link>
<.link
:if={is_owner?(@pipeline, @current_user)}
:if={Pipelines.is_owner?(@pipeline, @current_user)}
class="btn btn-primary"
patch={Routes.pipeline_show_path(@socket, :edit, @pipeline.slug)}
>
<%= dgettext("actions", "edit") %>
</.link>
<button
:if={is_owner_or_admin?(@pipeline, @current_user)}
:if={Pipelines.is_owner_or_admin?(@pipeline, @current_user)}
type="button"
class="btn btn-primary"
phx-click="delete"
@ -67,7 +67,7 @@
<%= gettext("%{position}. %{title}", position: position + 1, title: title) %>
</h3>
<%= if is_owner?(@pipeline, @current_user) do %>
<%= if Pipelines.is_owner?(@pipeline, @current_user) do %>
<div class="flex justify-between items-center space-x-4">
<%= if position <= 0 do %>
<i class="fas text-xl fa-chevron-up cursor-not-allowed opacity-25"></i>
@ -128,7 +128,7 @@
<% end %>
<.link
:if={is_owner?(@pipeline, @current_user)}
:if={Pipelines.is_owner?(@pipeline, @current_user)}
class="self-end btn btn-primary"
patch={Routes.pipeline_show_path(@socket, :add_step, @pipeline.slug)}
>