consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makes public activity toggleable

Browse Source
This commit is contained in:
Juanjo Bazán
2015-11-04 13:47:55 +01:00
committed by Juanjo Bazán
parent 6d26901f9f
commit f57eef4929
9 changed files with 105 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/views/users/show.html.erb
View File

@@ -4,21 +4,25 @@
<h2><%= avatar_image(@user, seed: @user.id, size: 60) %> <%= @user.name %></h2>
<dl class="sub-nav">
<% @valid_filters.each do |filter| %>
<% if @activity_counts[filter] > 0 %>
<% if @current_filter == filter %>
<dd class="active"> <%= t("users.show.filters.#{filter}", count: @activity_counts[filter]) %></dd>
<% else %>
<dd><%= link_to t("users.show.filters.#{filter}", count: @activity_counts[filter]),
current_path_with_query_params(filter: filter, page: 1) %></dd>
<% if @user.public_activity || @authorized_current_user %>
<dl class="sub-nav">
<% @valid_filters.each do |filter| %>
<% if @activity_counts[filter] > 0 %>
<% if @current_filter == filter %>
<dd class="active"> <%= t("users.show.filters.#{filter}", count: @activity_counts[filter]) %></dd>
<% else %>
<dd><%= link_to t("users.show.filters.#{filter}", count: @activity_counts[filter]),
current_path_with_query_params(filter: filter, page: 1) %></dd>
<% end %>
<% end %>
<% end %>
<% end %>
<%= t("users.show.no_activity") if @activity_counts.values.inject(&:+) == 0 %>
</dl>
<%= t("users.show.no_activity") if @activity_counts.values.inject(&:+) == 0 %>
</dl>
<%= render "activity_page" %>
<%= render "activity_page" %>
<% else %>
<p><%= t('users.show.private_activity') %></p>
<% end %>
</div>
</div>