Skip to content

Fix membership role action and checks under Site Settings > People #4910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zoldar merged 1 commit into from
Dec 16, 2024
Merged

Fix membership role action and checks under Site Settings > People #4910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/plausible_web/templates/site/settings_people.html.heex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
:update_role_by_user,
@site.domain,
membership.user.id,
"admin"
"editor"
)
}
method="put"
Expand All @@ -142,7 +142,7 @@
</p>
</div>

<%= if membership.role == :admin do %>
<%= if membership.role == "admin" do %>
Copy link
Contributor Author

@zoldar zoldar Dec 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently membership.role type here is inconsistent - for owner, it's an atom, for the rest, it's a string. We'll correct that on subsequent rewrite.

<span class="text-indigo-500 group-hover:text-white">
<svg
class="h-5 w-5"
Expand Down Expand Up @@ -182,7 +182,7 @@
</p>
</div>

<%= if membership.role == :viewer do %>
<%= if membership.role == "viewer" do %>
<span class="text-indigo-500 group-hover:text-white">
<svg
class="h-5 w-5"
Expand Down
6 changes: 3 additions & 3 deletions test/plausible_web/controllers/site/membership_controller_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest do
conn =
post(conn, "/sites/#{site.domain}/memberships/invite", %{
email: "[email protected]",
role: "admin"
role: "editor"
})

assert html_response(conn, 200) =~
Expand All @@ -82,7 +82,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest do
conn =
post(conn, "/sites/#{site.domain}/memberships/invite", %{
email: "[email protected]",
role: "admin"
role: "editor"
})

assert conn.status == 404
Expand Down Expand Up @@ -164,7 +164,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest do
conn =
post(conn, "/sites/#{site.domain}/memberships/invite", %{
email: second_member.email,
role: "admin"
role: "editor"
})

assert html_response(conn, 200) =~
Expand Down
Loading