Skip to content

Render partial with collection #416

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 5 commits into from
Oct 18, 2018
Merged

Render partial with collection #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
711ff32
render partial with collection for speed
markets Aug 31, 2018
5f695e4
render partial using collections also in users/manage view
markets Aug 31, 2018
3503172
members list: paginate with 20 per page (closes #422)
markets Sep 6, 2018
a17090b
In "/members/manage" view don't redirect to "/member" after cancel me…
markets Sep 20, 2018
3efaa4a
Merge branch 'develop' into render_partial_with_collection
enricostano Oct 18, 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
2 changes: 1 addition & 1 deletion app/controllers/members_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def destroy
find_member
toggle_active_posts
@member.destroy
redirect_to users_path
redirect_to manage_users_path
end

def toggle_manager
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def search_and_load_members(members_scope)
@search = members_scope.ransack(search_params)

@members =
@search.result.eager_load(:account, :user).page(params[:page]).per(25)
@search.result.eager_load(:account, :user).page(params[:page]).per(20)

@member_view_models =
@members.map { |m| MemberDecorator.new(m, self.class.helpers) }
Expand Down
58 changes: 30 additions & 28 deletions app/views/users/_member_card.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
<div class="to-member-card">
<div class="to-member-card__header">
<div class="to-member-card__header__avatar"><%= member.avatar_img(48) %></div>
<div class="to-member-card__header__text">
<h4><%= member.link_to_self %></h4>
<div class="to-member-card__header__text__activity">
<%= "##{member.member_uid} — " %>
<% if member.last_sign_in_at %>
<%= t('.active_ago', time: distance_of_time_in_words(Time.now, member.last_sign_in_at)) %>
<% else %>
<%= t('.no_activity') %>
<% end %>
<div class="col-lg-6 col-sm-12">
<div class="to-member-card">
<div class="to-member-card__header">
<div class="to-member-card__header__avatar"><%= member.avatar_img(48) %></div>
<div class="to-member-card__header__text">
<h4><%= member.link_to_self %></h4>
<div class="to-member-card__header__text__activity">
<%= "##{member.member_uid} — " %>
<% if member.last_sign_in_at %>
<%= t('.active_ago', time: distance_of_time_in_words(Time.now, member.last_sign_in_at)) %>
<% else %>
<%= t('.no_activity') %>
<% end %>
</div>
</div>
</div>
</div>
<div class="to-member-card__body">
<div class="to-member-card__body__description">
<%= member.description %>
</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 class="to-member-card__body">
<div class="to-member-card__body__description">
<%= member.description %>
</div>
<div class="to-member-card__body__item">
<%= "Balance: " %>
<%= member.account_balance %>
<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>
<div class="to-member-card__body__item">
<%= "Balance: " %>
<%= member.account_balance %>
</div>
</div>
</div>
</div>
Expand Down
22 changes: 22 additions & 0 deletions app/views/users/_user_row.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<%= content_tag(:tr, class: member.row_css_class) do %>
<td> <%= member.avatar_img %> </td>
<td> <%= member.member_uid %> </td>
<td>
<%= 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>
<% if current_user.manages?(current_organization) %>
<td class="hover-actions hidden-xs hidden-sm">
<% if member.active? %>
<%= render 'toggle_manager_link', member: member if can_toggle_manager?(member) %>
<% else %>
<%= render 'cancel_membership_link', member: member if can_cancel_member?(member) %>
<% end %>

<%= render 'toggle_active_link', member: member if can_toggle_active?(member) %>
</td>
<% end %>
<% end %>
24 changes: 0 additions & 24 deletions app/views/users/_user_rows.html.erb
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions app/views/users/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@
</div>

<div class="row to-member-cards">
<% @member_view_models.each do |member| %>
<div class="col-lg-6 col-sm-12">
<%= render 'member_card', member: member %>
</div>
<% end %>
<%= render partial: 'member_card', collection: @member_view_models, as: :member %>
</div>

<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion app/views/users/manage.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</tr>
</thead>
<tbody>
<%= render "user_rows", members: @member_view_models %>
<%= render partial: "user_row", collection: @member_view_models, as: :member %>
</tbody>
</table>

Expand Down