Modified: branches/packs/app/views/packs/show.rhtml (3762 => 3763)
--- branches/packs/app/views/packs/show.rhtml 2013-11-01 15:02:27 UTC (rev 3762)
+++ branches/packs/app/views/packs/show.rhtml 2013-11-01 15:52:47 UTC (rev 3763)
@@ -238,12 +238,15 @@
<!-- END tabs -->
+<% activities = activities_for_feed(:context => @pack, :user => current_user) %>
+
+<h1>Activities</h1>
+<div id="activities">
+ <%= render(:partial => "activities/list", :locals => { :context => @pack, :activities => activities, :user => current_user, :enable_feature => true } ) -%>
+</div>
+
<br/>
<br/>
-<div id="commentsBox">
- <%= render :partial => "comments/comments", :locals => { :commentable => @pack } %>
-</div>
-
<%= render :partial => "contributions/alternative_formats" %>
Modified: branches/packs/config/routes.rb (3762 => 3763)
--- branches/packs/config/routes.rb 2013-11-01 15:02:27 UTC (rev 3762)
+++ branches/packs/config/routes.rb 2013-11-01 15:52:47 UTC (rev 3763)
@@ -71,6 +71,9 @@
pack.resources :annotations
pack.resources :items, :requirements => { :id => /[^;]+/ }
pack.resources :checklists
+ pack.resources :activities, :member => { :feature => [:put, :delete] } do |activity|
+ activity.resources :comments
+ end
end
# workflows (downloadable)