Skip to content

Commit 471ef0e

Browse files
committed
#33 Adding a team member as not-admin not handled properly
Signed-off-by: Kai Wagner <[email protected]>
1 parent 7ad5c99 commit 471ef0e

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

app/assets/stylesheets/components/settings.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,22 @@
2222
color: var(--color-text-primary);
2323
}
2424

25+
.settings-page .settings-hint {
26+
margin-bottom: var(--spacing-4);
27+
color: var(--color-text-secondary);
28+
font-size: var(--font-size-sm);
29+
}
30+
31+
.settings-page fieldset[disabled] {
32+
opacity: 0.6;
33+
cursor: not-allowed;
34+
}
35+
36+
.settings-page fieldset[disabled] input,
37+
.settings-page fieldset[disabled] button {
38+
cursor: not-allowed;
39+
}
40+
2541
.settings-warning {
2642
margin-bottom: var(--spacing-4);
2743
color: var(--color-warning-text);

app/controllers/settings/teams_controller.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ def index
1515
def show
1616
@team_members = @team.team_members.includes(:user)
1717
@can_manage = user_signed_in? && @team.admin?(current_user)
18-
@can_invite = user_signed_in? && (@team.member?(current_user) || @team.admin?(current_user))
18+
@can_invite = user_signed_in? && @team.admin?(current_user)
19+
@can_view_invite = user_signed_in? && @team.member?(current_user)
1920
end
2021

2122
def create

app/views/settings/teams/show.html.slim

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@
2121
- else
2222
p No members yet.
2323

24-
- if @can_invite
24+
- if @can_view_invite
2525
.invite-section
2626
h2 Add member
27+
- unless @can_invite
28+
p.settings-hint Only team admins can add members.
2729
= form_with url: settings_team_team_members_path(@team), method: :post, local: true do |f|
28-
.form-group
29-
= label_tag :username, "Username"
30-
= text_field_tag :username, nil, required: true, placeholder: "existing_username"
31-
= f.submit "Add", class: "button-primary"
30+
fieldset disabled=(!@can_invite)
31+
.form-group
32+
= label_tag :username, "Username"
33+
= text_field_tag :username, nil, required: true, placeholder: "existing_username"
34+
= f.submit "Add", class: "button-primary"

0 commit comments

Comments
 (0)