Skip to content

Use membership decorator in view #351

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
merged 12 commits into from
May 17, 2018
Merged

Use membership decorator in view #351

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5752cd8
Use membership decorator in view [WIP]
rewritten May 8, 2018
f6e5128
WIP
rewritten May 8, 2018
5c2c25b
WIP
rewritten May 8, 2018
67f8423
Added missing tests; extract partials from row
rewritten May 9, 2018
8b7595c
Fix last test
rewritten May 9, 2018
acc0a61
Fix tests after running whole suite
rewritten May 9, 2018
cd25968
Sorting by balance spec wasn't stable, check just th relevant position
rewritten May 9, 2018
317db4e
CR suggestions
rewritten May 13, 2018
edd4797
Make the member list view do ransack on members table
rewritten May 14, 2018
0dabcd1
Ransack form can be configured. RTFM.
rewritten May 14, 2018
d42625c
Nicer encapsulation of search params
rewritten May 14, 2018
57fe79c
Set back the loglevel to warn in test env
rewritten May 14, 2018
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
Prev Previous commit
Next Next commit
WIP
  • Loading branch information
@rewritten
rewritten committed May 8, 2018
commit f6e512805f040ddd2bb49b39e8fbd70107c5572c
7 changes: 4 additions & 3 deletions app/controllers/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ def index

@memberships = current_organization.members.
where(user_id: @users.map(&:id)).
includes(:account).each_with_object({}) do |mem, ob|
ob[mem.user_id] = mem
end
includes(:account, :user).
to_a.
sort_by { |m| @users.index(m.user) }.
map { |m| MemberDecorator.new(m, view_context) }
end

def show
Expand Down
38 changes: 18 additions & 20 deletions app/views/users/_user_rows.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
<% users.each do |user| %>
<% membership = memberships[user.id] %>

<%= content_tag(:tr, class: membership.row_css_class) do %>
<td> <%= membership.avatar %> </td>
<td> <%= membership.member_uid %> </td>
<% members.each do |member| %>
<%= content_tag(:tr, class: member.row_css_class) do %>
<td> <%= member.avatar %> </td>
<td> <%= member.member_uid %> </td>
<td>
<%= membership.inactive_icon %>
<%= membership.link_to_self %>
<%= member.inactive_icon %>
<%= member.link_to_self %>
</td>
<td> <%= membership.mail_to %> </td>
<td> <%= membership.phone %> </td>
<td> <%= membership.alt_phone %> </td>
<td> <%= membership.account_balance %> </td>
<td> <%= member.mail_to %> </td>
<td> <%= member.phone %> </td>
<td> <%= member.alt_phone %> </td>
<td> <%= member.account_balance %> </td>
<% if current_user.manages?(current_organization) %>
<td class="hover-actions">
<%= link_to membership.edit_user_path, class: "action" do %>
<%= link_to member.edit_user_path, class: "action" do %>
<%= glyph :pencil %>
<%= t "global.edit" %>
<% end %>

<% if membership.active? %>
<%= link_to membership.toggle_manager_member_path, class: "action", method: :put, data: { confirm: t('users.index.manage_warning', username: membership.username) } do %>
<% if !!membership.manager %>
<% if member.active? %>
<%= link_to member.toggle_manager_member_path, class: "action", method: :put, data: { confirm: t('users.index.manage_warning', username: member.username) } do %>
<% if !!member.manager %>
<%= glyph :arrow_down %>
<%= t "global.demote" %>
<% else %>
Expand All @@ -30,14 +28,14 @@
<% end %>
<% end %>
<% else %>
<%= link_to membership.cancel_member_path, class: "action", data: { confirm: t('.cancel_warning', user: membership.username) }, method: :delete do %>
<%= link_to member.cancel_member_path, class: "action", data: { confirm: t('.cancel_warning', user: member.username) }, method: :delete do %>
<%= glyph :ban_circle %>
<%= t("global.cancel_membership") %>
<%= t("global.cancel_member") %>
<% end %>
<% end %>

<%= link_to membership.toggle_active_member_path, class: "action", method: :put, data: { confirm: t('users.index.active_warning', username: membership.username) } do %>
<% if membership.active? %>
<%= link_to member.toggle_active_member_path, class: "action", method: :put, data: { confirm: t('users.index.active_warning', username: member.username) } do %>
<% if member.active? %>
<%= glyph :remove %>
<%= t ".deactivate" %>
<% else %>
Expand Down
18 changes: 18 additions & 0 deletions spec/decorators/member_decorator_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,28 @@

describe '#row_css_class' do
subject { decorator.row_css_class }

context 'active member' do
it { is_expected.to be_nil }
end

context 'inactive member' do
before { member.update_attributes(active: false) }
it { is_expected.to eq('bg-danger') }
end
end

describe '#inactive_icon' do
subject { decorator.inactive_icon }

context 'active member' do
it { is_expected.to be_nil }
end

context 'inactive member' do
before { member.update_attributes(active: false) }
it { is_expected.to match('icon') }
end
end

describe '#link_to_self' do
Expand Down