diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index 4a1589d25..37bd76d7c 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -8,12 +8,12 @@ class ActivitiesController < ApplicationController def index if request.xhr? - @activities = PublicActivity::Activity.order('created_at desc') + @activities = @resource.activities.order('created_at desc') respond_to do |format| - format.html { render partial: 'activities/activity_log', locals: { resource: @resource } } + format.html { render partial: 'activities/activity_log', locals: { activities: @activities } } end else - @activities = PublicActivity::Activity.order('created_at desc').paginate(page: params[:page], per_page: 50) + @activities = @resource.activities.order('created_at desc').paginate(page: params[:page], per_page: 50) respond_to do |format| format.html end diff --git a/app/helpers/activity_helper.rb b/app/helpers/activity_helper.rb new file mode 100644 index 000000000..9a1c897e0 --- /dev/null +++ b/app/helpers/activity_helper.rb @@ -0,0 +1,20 @@ +# The helper for PublicActivity + +module ActivityHelper + def activity_owner(activity) + if activity.owner + link_to activity.owner.username, activity.owner + else + t('activity.deleted_owner') + end + end + + def activity_resource(activity) + if activity.trackable + title_field = activity.trackable.is_a?(User) ? :name : :title + link_to activity.trackable.send(title_field), activity.trackable + else + t('activity.deleted_trackable') + end + end +end \ No newline at end of file diff --git a/app/views/activities/_activity_log.html.erb b/app/views/activities/_activity_log.html.erb index c5f845c42..99c7c5764 100644 --- a/app/views/activities/_activity_log.html.erb +++ b/app/views/activities/_activity_log.html.erb @@ -1,16 +1,8 @@ -<%# Activity log partial that renders activity log for a resource. - -Variables that should be available -- resource - resource whose activity log is being displayed (a material, a content provider, etc...) -%> -<% unless resource.blank? %> -
- <% if resource.activities.blank? %> -

No activities recorded.

- <% else %> - <% resource.activities.order(created_at: :desc).each do |activity| %> - <%= render_activity(activity, layout: :activity) %> - <% end %> - <% end %> -
-<% end %> \ No newline at end of file +<%# Activity log partial that renders activity log for a resource.%> +<% if activities.blank? %> +

<%= t('activity.empty') %>

+<% else %> + <% activities.each do |activity| %> + <%= render_activity(activity, layout: :activity, display: "common/#{activity.key.split('.').last}") %> + <% end %> +<% end %> diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb index 85e208256..c2d43fe50 100644 --- a/app/views/activities/index.html.erb +++ b/app/views/activities/index.html.erb @@ -2,15 +2,6 @@ <%= will_paginate @activities, param_name: 'page', renderer: BootstrapPagination::Rails %> -<% @activities.each do |activity| %> -
- <% if activity.owner -%> - <%= link_to activity.owner[:username], activity.owner %> - <% else -%> - Someone - <% end -%> - <%= render_activity activity %> -
-<% end %> +<%= render partial: 'activities/activity_log', locals: { activities: @activities } %> <%= will_paginate @activities, param_name: 'page', renderer: BootstrapPagination::Rails %> diff --git a/app/views/activities/show.html.erb b/app/views/activities/show.html.erb deleted file mode 100644 index 5059b06f6..000000000 --- a/app/views/activities/show.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<%#= render_activities(@activities, layout: :activity) %> - -<% @resource.activities.each do |activity| %> -
- <%= render_activity(activity) %> -
-<% end %> \ No newline at end of file diff --git a/app/views/public_activity/collection/_add_event.html.erb b/app/views/public_activity/collection/_add_event.html.erb deleted file mode 100644 index 4b5ad87e4..000000000 --- a/app/views/public_activity/collection/_add_event.html.erb +++ /dev/null @@ -1,12 +0,0 @@ - - -<% if activity.owner %> - <%= link_to activity.owner.username, activity.owner %> -<% end %> - -added event -<%= link_to activity.parameters[:event_title], event_path(activity.parameters[:event_id]) %> -to -<%= link_to activity.trackable.title, activity.trackable %> -at -<%= activity.created_at -%>. diff --git a/app/views/public_activity/collection/_add_item.html.erb b/app/views/public_activity/collection/_add_item.html.erb deleted file mode 100644 index a47a737b7..000000000 --- a/app/views/public_activity/collection/_add_item.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -<% type = activity.parameters[:resource_type].constantize %> - - - -<% if activity.owner %> - <%= link_to activity.owner.username, activity.owner %> -<% end %> - -added <%= type.model_name.human.downcase %> -<%= link_to activity.parameters[:resource_title], polymorphic_path(type.model_name.singular.to_sym, - id: activity.parameters[:resource_id]) %> -to -<%= link_to activity.trackable.title, activity.trackable %> -at -<%= activity.created_at -%>. diff --git a/app/views/public_activity/collection/_add_material.html.erb b/app/views/public_activity/collection/_add_material.html.erb deleted file mode 100644 index 7b5201b3f..000000000 --- a/app/views/public_activity/collection/_add_material.html.erb +++ /dev/null @@ -1,12 +0,0 @@ - - -<% if activity.owner %> - <%= link_to activity.owner.username, activity.owner %> -<% end %> - -added material -<%= link_to activity.parameters[:material_title], material_path(activity.parameters[:material_id]) %> -to -<%= link_to activity.trackable.title, activity.trackable %> -at -<%= activity.created_at -%>. diff --git a/app/views/public_activity/collection/_create.html.erb b/app/views/public_activity/collection/_create.html.erb deleted file mode 100644 index 3cc158f1b..000000000 --- a/app/views/public_activity/collection/_create.html.erb +++ /dev/null @@ -1,9 +0,0 @@ - - -<% if activity.owner %> - <%= link_to activity.owner.username, activity.owner %> -<% end %> - -created - -<%= link_to activity.trackable.title, activity.trackable %> at <%= activity.created_at -%>. \ No newline at end of file diff --git a/app/views/public_activity/collection/_destroy.html.erb b/app/views/public_activity/collection/_destroy.html.erb deleted file mode 100644 index 32b6b663c..000000000 --- a/app/views/public_activity/collection/_destroy.html.erb +++ /dev/null @@ -1,6 +0,0 @@ - -<% if activity.owner %> - <%= link_to activity.owner.username, activity.owner %> -<% end %> - -created <%= link_to activity.trackable.title, activity.trackable %> at <%= activity.created_at -%>. \ No newline at end of file diff --git a/app/views/public_activity/collection/_update.html.erb b/app/views/public_activity/collection/_update.html.erb deleted file mode 100644 index b322f8d47..000000000 --- a/app/views/public_activity/collection/_update.html.erb +++ /dev/null @@ -1,8 +0,0 @@ - - -<% if activity.owner %> - <%= link_to activity.owner.username, activity.owner %> -<% end %> - -updated -<%= link_to activity.trackable.title, activity.trackable %> at <%= activity.created_at -%>. \ No newline at end of file diff --git a/app/views/public_activity/collection/_update_parameter.html.erb b/app/views/public_activity/collection/_update_parameter.html.erb deleted file mode 100644 index 807c5e188..000000000 --- a/app/views/public_activity/collection/_update_parameter.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -<% unless activity.parameters.empty? %> - <%= render partial: 'public_activity/common/parameter_change', object: activity.parameters %> -<% end %> diff --git a/app/views/public_activity/common/_add_data.html.erb b/app/views/public_activity/common/_add_data.html.erb new file mode 100644 index 000000000..b12f97f6d --- /dev/null +++ b/app/views/public_activity/common/_add_data.html.erb @@ -0,0 +1,5 @@ + +<%= activity_owner(activity) %> +<%= t('activity.actions.data_suggestion_add') %> <%= activity.parameters[:name] %> +<%= t('activity.target_html', resource: activity_resource(activity)) %> +<%= t('activity.timestamp', time: activity.created_at) -%>. \ No newline at end of file diff --git a/app/views/public_activity/common/_add_event.html.erb b/app/views/public_activity/common/_add_event.html.erb new file mode 100644 index 000000000..8b59a25c5 --- /dev/null +++ b/app/views/public_activity/common/_add_event.html.erb @@ -0,0 +1,6 @@ + +<%= activity_owner(activity) %> +<%= t('activity.actions.add') %> <%= Event.model_name.human.downcase %> <%= link_to activity.parameters[:event_title], + event_path(activity.parameters[:event_id]) %> +<%= t('activity.target_html', resource: activity_resource(activity)) %> +<%= t('activity.timestamp', time: activity.created_at) -%>. diff --git a/app/views/public_activity/common/_add_item.html.erb b/app/views/public_activity/common/_add_item.html.erb new file mode 100644 index 000000000..fff4e9f65 --- /dev/null +++ b/app/views/public_activity/common/_add_item.html.erb @@ -0,0 +1,8 @@ +<% type = activity.parameters[:resource_type].constantize %> + +<%= activity_owner(activity) %> +<%= t('activity.actions.add') %> <%= type.model_name.human.downcase %> <%= link_to activity.parameters[:resource_title], + polymorphic_path(type.model_name.singular.to_sym, + id: activity.parameters[:resource_id]) %> +<%= t('activity.target_html', resource: activity_resource(activity)) %> +<%= t('activity.timestamp', time: activity.created_at) -%>. diff --git a/app/views/public_activity/common/_add_material.html.erb b/app/views/public_activity/common/_add_material.html.erb new file mode 100644 index 000000000..f54d0308b --- /dev/null +++ b/app/views/public_activity/common/_add_material.html.erb @@ -0,0 +1,6 @@ + +<%= activity_owner(activity) %> +<%= t('activity.actions.add') %> <%= Material.model_name.human.downcase %> <%= link_to activity.parameters[:material_title], + material_path(activity.parameters[:material_id]) %> +<%= t('activity.target_html', resource: activity_resource(activity)) %> +<%= t('activity.timestamp', time: activity.created_at) -%>. diff --git a/app/views/public_activity/common/_add_term.html.erb b/app/views/public_activity/common/_add_term.html.erb new file mode 100644 index 000000000..d81dc202c --- /dev/null +++ b/app/views/public_activity/common/_add_term.html.erb @@ -0,0 +1,5 @@ + +<%= activity_owner(activity) %> +<%= t('activity.actions.term_suggestion_add', field: activity.parameters[:field].try(:singularize)) %> <%= activity.parameters[:name] %> +<%= t('activity.target_html', resource: activity_resource(activity)) %> +<%= t('activity.timestamp', time: activity.created_at) -%>. diff --git a/app/views/public_activity/common/_add_to_collection.html.erb b/app/views/public_activity/common/_add_to_collection.html.erb new file mode 100644 index 000000000..9fda46fbe --- /dev/null +++ b/app/views/public_activity/common/_add_to_collection.html.erb @@ -0,0 +1,6 @@ +<% return unless activity.parameters.present? %> + +<%= activity_owner(activity) %> +<%= t('activity.actions.add') %> <%= activity_resource(activity) %> +<%= t('activity.target_html', resource: link_to(activity.parameters[:collection_title], collection_path(activity.parameters[:collection_id]))) %> +<%= t('activity.timestamp', time: activity.created_at) -%>. diff --git a/app/views/public_activity/common/_add_to_topic.html.erb b/app/views/public_activity/common/_add_to_topic.html.erb new file mode 100644 index 000000000..5bcf1fc00 --- /dev/null +++ b/app/views/public_activity/common/_add_to_topic.html.erb @@ -0,0 +1,6 @@ +<% return unless activity.parameters.present? %> + +<%= activity_owner(activity) %> +<%= t('activity.actions.add') %> <%= activity_resource(activity) %> +<%= t('activity.target_html', resource: link_to(activity.parameters[:topic_title], learning_path_topic_path(activity.parameters[:topic_id]))) %> +<%= t('activity.timestamp', time: activity.created_at) -%>. diff --git a/app/views/public_activity/common/_add_topic.html.erb b/app/views/public_activity/common/_add_topic.html.erb new file mode 100644 index 000000000..fef4a9466 --- /dev/null +++ b/app/views/public_activity/common/_add_topic.html.erb @@ -0,0 +1,6 @@ + +<%= activity_owner(activity) %> +<%= t('activity.actions.add_topic_html', + resource: activity_resource(activity), + topic: link_to(activity.parameters[:topic_title], learning_path_topic_path(activity.parameters[:topic_id]))) %> +<%= t('activity.timestamp', time: activity.created_at) -%>. diff --git a/app/views/public_activity/common/_approval_status_changed.html.erb b/app/views/public_activity/common/_approval_status_changed.html.erb new file mode 100644 index 000000000..e8d4a6e06 --- /dev/null +++ b/app/views/public_activity/common/_approval_status_changed.html.erb @@ -0,0 +1,6 @@ + +<%= activity_owner(activity) %> +<%= t('activity.actions.approval_status_change_html', + source: activity_resource(activity), + status: source_approval_badge(activity.parameters[:new])) %> +<%= t('activity.timestamp', time: activity.created_at) -%>. diff --git a/app/views/public_activity/common/_change_role.html.erb b/app/views/public_activity/common/_change_role.html.erb new file mode 100644 index 000000000..f2ed6a192 --- /dev/null +++ b/app/views/public_activity/common/_change_role.html.erb @@ -0,0 +1,7 @@ + +<%= activity_owner(activity) %> +<%= t('activity.actions.change_role_html', + user: activity_resource(activity), + old: Role.find_by_id(activity.parameters[:old])&.title || activity.parameters[:old], + new: Role.find_by_id(activity.parameters[:new])&.title || activity.parameters[:new]) %> +<%= t('activity.timestamp', time: activity.created_at) -%>. diff --git a/app/views/public_activity/common/_create.html.erb b/app/views/public_activity/common/_create.html.erb new file mode 100644 index 000000000..d8ce18562 --- /dev/null +++ b/app/views/public_activity/common/_create.html.erb @@ -0,0 +1,4 @@ + +<%= activity_owner(activity) %> +<%= t('activity.actions.create') %> <%= activity_resource(activity) %> +<%= t('activity.timestamp', time: activity.created_at) -%>. diff --git a/app/views/public_activity/common/_destroy.html.erb b/app/views/public_activity/common/_destroy.html.erb new file mode 100644 index 000000000..ca4f35954 --- /dev/null +++ b/app/views/public_activity/common/_destroy.html.erb @@ -0,0 +1,4 @@ + +<%= activity_owner(activity) %> +<%= t('activity.actions.destroy') %> <%= activity_resource(activity) %> +<%= t('activity.timestamp', time: activity.created_at) -%>. diff --git a/app/views/public_activity/workflow/_modify_diagram.html.erb b/app/views/public_activity/common/_modify_diagram.html.erb similarity index 51% rename from app/views/public_activity/workflow/_modify_diagram.html.erb rename to app/views/public_activity/common/_modify_diagram.html.erb index 31018c213..4a4e9e6de 100644 --- a/app/views/public_activity/workflow/_modify_diagram.html.erb +++ b/app/views/public_activity/common/_modify_diagram.html.erb @@ -1,15 +1,12 @@ - -<% if activity.owner %> - <%= link_to activity.owner.username, activity.owner %> -<% end %> - -modified the workflow diagram at <%= activity.created_at -%>. +<%= activity_owner(activity) %> +<%= t('activity.actions.workflows.modify_diagram') %> +<%= t('activity.timestamp', time: activity.created_at) -%>.