Skip to content
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

feat: add member list to detail view #376

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

feat: add member list to detail view #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f593ecd
feat: add member list to detail view
TobiPeterG Jan 31, 2023
83d786d
fix: show cell in group edit view for admins where user actions are
TobiPeterG Jan 31, 2023
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
5 changes: 4 additions & 1 deletion app/views/groups/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
<i class="bi bi-person-dash-fill"></i>
<% end %>
</td>
<% else %>
<td>
</td>
Comment on lines +36 to +38
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Is this worth an extra issue?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think its fine just fixing it here

<% end %>
</tr>
<% end %>
Expand All @@ -51,4 +54,4 @@
</button>
<%= render "modal-delete", group: @group %>
</div>
<% end %>
<% end %>
27 changes: 27 additions & 0 deletions app/views/groups/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,30 @@
<%= t('items.headlines.items') %>
</h5>
<%= render GroupItemListComponent.new(group: @group) %>
<table class="table table-bordered">
Copy link
Collaborator

Choose a reason for hiding this comment

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

The member count should also be displayed as seen in the wireframe.
Also already done in edit.html.erb

<thead>
<tr>
<th scope="col"><%= t(:member_name) %></th>
<th scope="col"><%= t(:member_email) %></th>
<th scope="col" style="width: 3rem"></th>
</tr>
</thead>
<tbody class="table-group-divider">
<% @group.users.each do |user| %>
<tr>
<td><%= user.full_name %></td>
<td><%= user.email %></td>
<% if not user.admin_in?(@group) %>
<td>
<%= mail_to user.email, class: "btn btn-sm btn-secondary" do %>
<i class="bi bi-chat-fill"></i>
<% end %>
</td>
<% else %>
<td>
</td>
<% end %>
</tr>
<% end %>
</tbody>
</table>
Comment on lines +13 to +39
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is copied from edit.html.erb right?, would it be an option to make use of components/fragments to minimize duplication?