From 3fa97c95aa2bee85da62c8a0b231ef4b23855555 Mon Sep 17 00:00:00 2001 From: Kai Wagner Date: Wed, 14 Jan 2026 16:30:01 +0100 Subject: [PATCH 1/2] #33 Adding a team member as not-admin not handled properly Signed-off-by: Kai Wagner --- app/assets/stylesheets/components/settings.css | 16 ++++++++++++++++ app/controllers/settings/teams_controller.rb | 3 ++- app/views/settings/teams/show.html.slim | 13 ++++++++----- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/components/settings.css b/app/assets/stylesheets/components/settings.css index f6ac449..f544ebf 100644 --- a/app/assets/stylesheets/components/settings.css +++ b/app/assets/stylesheets/components/settings.css @@ -22,6 +22,22 @@ color: var(--color-text-primary); } +.settings-page .settings-hint { + margin-bottom: var(--spacing-4); + color: var(--color-text-secondary); + font-size: var(--font-size-sm); +} + +.settings-page fieldset[disabled] { + opacity: 0.6; + cursor: not-allowed; +} + +.settings-page fieldset[disabled] input, +.settings-page fieldset[disabled] button { + cursor: not-allowed; +} + .settings-warning { margin-bottom: var(--spacing-4); color: var(--color-warning-text); diff --git a/app/controllers/settings/teams_controller.rb b/app/controllers/settings/teams_controller.rb index 992f8f0..7eb6d4a 100644 --- a/app/controllers/settings/teams_controller.rb +++ b/app/controllers/settings/teams_controller.rb @@ -15,7 +15,8 @@ def index def show @team_members = @team.team_members.includes(:user) @can_manage = user_signed_in? && @team.admin?(current_user) - @can_invite = user_signed_in? && (@team.member?(current_user) || @team.admin?(current_user)) + @can_invite = user_signed_in? && @team.admin?(current_user) + @can_view_invite = user_signed_in? && @team.member?(current_user) end def create diff --git a/app/views/settings/teams/show.html.slim b/app/views/settings/teams/show.html.slim index d444954..aa2bc27 100644 --- a/app/views/settings/teams/show.html.slim +++ b/app/views/settings/teams/show.html.slim @@ -21,11 +21,14 @@ - else p No members yet. - - if @can_invite + - if @can_view_invite .invite-section h2 Add member + - unless @can_invite + p.settings-hint Only team admins can add members. = form_with url: settings_team_team_members_path(@team), method: :post, local: true do |f| - .form-group - = label_tag :username, "Username" - = text_field_tag :username, nil, required: true, placeholder: "existing_username" - = f.submit "Add", class: "button-primary" + fieldset disabled=(!@can_invite) + .form-group + = label_tag :username, "Username" + = text_field_tag :username, nil, required: true, placeholder: "existing_username" + = f.submit "Add", class: "button-primary" From c4a1d042293859539447d5a4b7a5a40acbdda81d Mon Sep 17 00:00:00 2001 From: Kai Wagner Date: Wed, 14 Jan 2026 20:26:00 +0100 Subject: [PATCH 2/2] removed unneccessary view Signed-off-by: Kai Wagner --- app/controllers/settings/teams_controller.rb | 1 - app/views/settings/teams/show.html.slim | 21 ++++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/controllers/settings/teams_controller.rb b/app/controllers/settings/teams_controller.rb index 7eb6d4a..3c619ef 100644 --- a/app/controllers/settings/teams_controller.rb +++ b/app/controllers/settings/teams_controller.rb @@ -16,7 +16,6 @@ def show @team_members = @team.team_members.includes(:user) @can_manage = user_signed_in? && @team.admin?(current_user) @can_invite = user_signed_in? && @team.admin?(current_user) - @can_view_invite = user_signed_in? && @team.member?(current_user) end def create diff --git a/app/views/settings/teams/show.html.slim b/app/views/settings/teams/show.html.slim index aa2bc27..0d6cf0d 100644 --- a/app/views/settings/teams/show.html.slim +++ b/app/views/settings/teams/show.html.slim @@ -21,14 +21,13 @@ - else p No members yet. - - if @can_view_invite - .invite-section - h2 Add member - - unless @can_invite - p.settings-hint Only team admins can add members. - = form_with url: settings_team_team_members_path(@team), method: :post, local: true do |f| - fieldset disabled=(!@can_invite) - .form-group - = label_tag :username, "Username" - = text_field_tag :username, nil, required: true, placeholder: "existing_username" - = f.submit "Add", class: "button-primary" + .invite-section + h2 Add member + - unless @can_invite + p.settings-hint Only team admins can add members. + = form_with url: settings_team_team_members_path(@team), method: :post, local: true do |f| + fieldset disabled=(!@can_invite) + .form-group + = label_tag :username, "Username" + = text_field_tag :username, nil, required: true, placeholder: "existing_username" + = f.submit "Add", class: "button-primary"