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/note_live/index.ex
View File

@ -1,6 +1,6 @@
defmodule MemexWeb.NoteLive.Index do
use MemexWeb, :live_view
alias Memex.{Accounts.User, Notes, Notes.Note}
alias Memex.{Notes, Notes.Note}
@impl true
def mount(%{"search" => search}, _session, socket) do
@ -75,13 +75,4 @@ defmodule MemexWeb.NoteLive.Index do
defp display_notes(%{assigns: %{search: search}} = socket) do
socket |> assign(notes: Notes.list_public_notes(search))
end
@spec is_owner_or_admin?(Note.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?(Note.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/note_live/index.html.heex
View File

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

11
lib/memex_web/live/note_live/show.ex
View File

@ -1,6 +1,6 @@
defmodule MemexWeb.NoteLive.Show do
use MemexWeb, :live_view
alias Memex.{Accounts.User, Notes, Notes.Note}
alias Memex.Notes
@impl true
def mount(_params, _session, socket) do
@ -45,13 +45,4 @@ defmodule MemexWeb.NoteLive.Show do
defp page_title(:show, %{slug: slug}), do: slug
defp page_title(:edit, %{slug: slug}), do: gettext("edit %{slug}", slug: slug)
@spec is_owner_or_admin?(Note.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?(Note.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/note_live/show.html.heex
View File

@ -24,14 +24,14 @@
<%= dgettext("actions", "back") %>
</.link>
<.link
:if={is_owner?(@note, @current_user)}
:if={Notes.is_owner?(@note, @current_user)}
class="btn btn-primary"
patch={Routes.note_show_path(@socket, :edit, @note.slug)}
>
<%= dgettext("actions", "edit") %>
</.link>
<button
:if={is_owner_or_admin?(@note, @current_user)}
:if={Notes.is_owner_or_admin?(@note, @current_user)}
type="button"
class="btn btn-primary"
phx-click="delete"