Skip to content

Commit 49c0ce4

Browse files
authored
Merge pull request #144 from basecamp/user-self
User self
2 parents 089a8b3 + 88f3f94 commit 49c0ce4

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

app/assets/stylesheets/buttons.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,13 @@
127127
}
128128
}
129129

130+
&:has(input[type=checkbox][disabled]) {
131+
cursor: not-allowed;
132+
filter: grayscale(100%) contrast(0.5);
133+
opacity: 0.5;
134+
pointer-events: none;
135+
}
136+
130137
[disabled] &[type=submit],
131138
&[type=submit]:disabled {
132139
cursor: not-allowed;

app/views/accounts/users/_user.html.erb

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,26 @@
99

1010
<hr class="separator" aria-hidden="true">
1111

12-
<% if Current.user.can_administer? && user != Current.user && user.active? %>
12+
<% if Current.user.can_administer? && user.active? %>
1313
<% unless user.bot? %>
1414
<%= form_with model: user, url: account_user_path(user), data: { controller: "form" }, method: :patch do | form | %>
1515
<label class="btn txt-small flex-item-no-shrink" for="<%= dom_id(user, :role) %>">
1616
<span class="for-screen-reader">Role: <%= user.administrator? ? "Administrator" : "Member" %></span>
1717
<%= image_tag "crown.svg", size: 20, aria: { hidden: "true" } %>
18-
<%= form.check_box :role, { data: { action: "form#submit" }, hidden: true, id: dom_id(user, :role) }, "administrator", "member" %>
18+
<%= form.check_box :role, { data: { action: "form#submit" }, hidden: true, id: dom_id(user, :role), disabled: user == Current.user }, "administrator", "member" %>
1919
</label>
2020
<% end %>
2121
<% end %>
2222

23-
<%= button_to account_user_path(user), method: :delete, class: "btn txt-small flex-item-no-shrink btn--negative", data: {
24-
turbo_confirm: "Are you sure you want to permanently remove this person from the account? This can’t be undone."} do %>
25-
<%= image_tag "minus.svg", size: 20, aria: { hidden: "true" } %>
26-
<span class="for-screen-reader">Delete <%= user.name %></span>
23+
<% unless user == Current.user %>
24+
<%= button_to account_user_path(user), method: :delete, class: "btn txt-small flex-item-no-shrink btn--negative", data: {
25+
turbo_confirm: "Are you sure you want to permanently remove this person from the account? This can’t be undone."} do %>
26+
<%= image_tag "minus.svg", size: 20, aria: { hidden: "true" } %>
27+
<span class="for-screen-reader">Delete <%= user.name %></span>
28+
<% end %>
2729
<% end %>
28-
<% elsif user == Current.user %>
30+
<% end %>
31+
<% if user == Current.user %>
2932
<%= link_to user_profile_path, class: "btn txt-small flex-item-no-shrink", target: "_top" do %>
3033
<%= image_tag "pencil.svg", size: 20, aria: { hidden: "true" } %>
3134
<span class="for-screen-reader">My settings</span>

0 commit comments

Comments
 (0)