Skip to content

Little improvements in /members #436

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 9 commits into from
Oct 19, 2018
Merged

Little improvements in /members #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8f326bb
Do not hide actions in the manage users page
mllocs Sep 25, 2018
b0d675c
Sort members by last_sign_in_at
mllocs Sep 25, 2018
4854065
Truncate member description
mllocs Sep 25, 2018
dd5db0a
Hide telephone icon when there is no phone number
mllocs Sep 25, 2018
3286098
Fixed checking phone presence logic
mllocs Oct 6, 2018
67c37dd
Fixed specs
mllocs Oct 6, 2018
ecbb5ed
Do not show email if it is "blank" or example.com
mllocs Oct 19, 2018
9208d17
Revert sorting by user_last_sign_in_at
mllocs Oct 19, 2018
6e81774
Redo not hidding columns in mobile after rebasing conflict
mllocs Oct 19, 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
12 changes: 4 additions & 8 deletions app/controllers/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ class UsersController < ApplicationController
before_filter :authenticate_user!

def index
search_and_load_members current_organization.members.active
search_and_load_members current_organization.members.active, {s: 'member_uid asc'}
end

def manage
search_and_load_members current_organization.members
search_and_load_members current_organization.members, {s: 'member_uid asc'}
end

def show
Expand Down Expand Up @@ -57,8 +57,8 @@ def update

private

def search_and_load_members(members_scope)
@search = members_scope.ransack(search_params)
def search_and_load_members(members_scope, default_search_params)
@search = members_scope.ransack(default_search_params.merge(params.fetch(:q, {})))

@members =
@search.result.eager_load(:account, :user).page(params[:page]).per(20)
Expand All @@ -67,10 +67,6 @@ def search_and_load_members(members_scope)
@members.map { |m| MemberDecorator.new(m, self.class.helpers) }
end

def search_params
{s: 'member_uid asc'}.merge(params.fetch(:q, {}))
end

def scoped_users
current_organization.users
end
Expand Down
22 changes: 13 additions & 9 deletions app/views/users/_member_card.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,21 @@
</div>
<div class="to-member-card__body">
<div class="to-member-card__body__description">
<%= member.description %>
<%= member.description&.truncate(124) %>
</div>
<div class="to-member-card__body__items">
<div class="to-member-card__body__item">
<span class="glyphicon glyphicon-earphone"></span>
<%= phone_to member.phone %>
</div>
<div class="to-member-card__body__item">
<span class="glyphicon glyphicon-envelope"></span>
<%= member.mail_to %>
</div>
<% if member.phone.present? && !member.phone.blank? %>
<div class="to-member-card__body__item">
<span class="glyphicon glyphicon-earphone"></span>
<%= phone_to member.phone %>
</div>
<% end %>
<% if member.mail_to.present? && !member.mail_to.blank? %>
<div class="to-member-card__body__item">
<span class="glyphicon glyphicon-envelope"></span>
<%= member.mail_to %>
</div>
<% end %>
<div class="to-member-card__body__item">
<%= "Balance: " %>
<%= member.account_balance %>
Expand Down
8 changes: 4 additions & 4 deletions app/views/users/_user_row.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<%= member.inactive_icon %>
<%= member.link_to_self %>
</td>
<td class="hidden-xs"> <%= member.mail_to %> </td>
<td class="hidden-xs hidden-sm"> <%= phone_to member.phone %> </td>
<td class="hidden-xs hidden-sm"> <%= member.account_balance %> </td>
<td> <%= member.mail_to %> </td>
<td> <%= phone_to member.phone %> </td>
<td> <%= member.account_balance %> </td>
<% if current_user.manages?(current_organization) %>
<td class="hover-actions hidden-xs hidden-sm">
<td class="hover-actions">
<% if member.active? %>
<%= render 'toggle_manager_link', member: member if can_toggle_manager?(member) %>
<% else %>
Expand Down
8 changes: 4 additions & 4 deletions app/views/users/manage.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@
<th>
<%= sort_link @search, :user_username, User.human_attribute_name(:username) %>
</th>
<th class="hidden-xs">
<th>
<%= User.human_attribute_name(:email) %>
</th>
<th class="hidden-xs hidden-sm">
<th>
<%= User.human_attribute_name(:phone) %>
</th>
<th class="hidden-xs hidden-sm">
<th>
<%= sort_link @search, 'account_balance', Account.human_attribute_name(:balance) %>
</th>
<% if current_user.manages? current_organization %>
<th class="hidden-xs hidden-sm">
<th>
<span class="glyphicon glyphicon-hand-down"></span>
<%= t(".actions") %>
</th>
Expand Down
1 change: 1 addition & 0 deletions spec/fabricators/user_fabricator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
address { Faker::Address.street_address + " " + Faker::Address.zip_code + " " + Faker::Address.city + " (" + Faker::Address.state + ")"}
gender { ["male", "female"].shuffle.first }
description { Faker::Lorem.paragraph }
last_sign_in_at { DateTime.new(2018, 10, 1) }

terms_accepted_at DateTime.now.utc
confirmed_at DateTime.now.utc
Expand Down