Merge branch 'develop' into cxt_course

app/controllers/blogs_controller.rb

@@ -29,7 +29,7 @@ class BlogsController < ApplicationController
   def set_homepage
     @blog = Blog.find(params[:id])
     @blog.update_attribute(:homepage_id, params[:article_id])
-    redirect_to user_blogs_path(params[:user_id])
+    redirect_to user_path(params[:user_id])
   end
 
   def cancel_homepage

app/views/org_subfields/_show_details.html.erb

@@ -42,7 +42,7 @@
             });
         </script>
         <% if act.container_type == 'Organization' %>
-            <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %>
+            <% if act.org_act_type == 'OrgDocumentComment' %>
                 <%= render :partial => 'organizations/show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %>
             <% end %>
         <% end %>