diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index fe4267d8a01..ff6bcbdc060 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -131,8 +131,8 @@ def profile @twitter = @profile_user.social_link("twitter") @facebook = @profile_user.social_link("facebook") @instagram = @profile_user.social_link("instagram") - - + @count_activities_posted = Tag.tagged_nodes_by_author("activity:*", @user).count + @count_activities_attempted = Tag.tagged_nodes_by_author("replication:*", @user).count @map_lat = nil @map_lon = nil @map_blurred = nil diff --git a/app/views/users/profile.html.erb b/app/views/users/profile.html.erb index 6032fa22230..72ce4fab6eb 100644 --- a/app/views/users/profile.html.erb +++ b/app/views/users/profile.html.erb @@ -5,7 +5,7 @@ <% end %> - +
<% if @twitter.nil? == false %> @@ -95,7 +95,7 @@ <% if @profile_user && current_user && @profile_user == current_user %> <% end %> - +
<% if params[:preview] %> @@ -158,8 +158,8 @@
-

<%= Node.questions.where(status: 1, uid: @user.id).length %> questions asked

<%= Answer.where(uid: @profile_user.id).count %> answers posted

-

<%= Comment.where(uid: @profile_user.id).count %> comments posted

+

<%= Node.questions.where(status: 1, uid: @user.id).length %> questions asked

<%= Answer.where(uid: @profile_user.id).count %> answers posted

+

<%= @count_activities_posted %> activities posted

<%= @count_activities_attempted %> activities attempted

<% if !@map_lat.nil? && !@map_lon.nil? %> <%= render :partial => "map/userLeaflet" , locals: {haslocation: true} %> <% elsif !current_user.nil? && current_user.id == @user.id %>