diff --git a/app/controllers/shield_activities_controller.rb b/app/controllers/shield_activities_controller.rb index 7f4f4eebf..b2d5191b3 100644 --- a/app/controllers/shield_activities_controller.rb +++ b/app/controllers/shield_activities_controller.rb @@ -15,7 +15,7 @@ class ShieldActivitiesController < ApplicationController end end - def destroy + def show_acts if params[:org_id] if params[:project_id] ShieldActivity.where("container_type='Organization' and container_id=#{params[:org_id].to_i} and shield_type='Project' and shield_id=#{params[:project_id]}").each do |act| diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index cd701d804..8c5d493d7 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -46,6 +46,9 @@ <% end %> TO <%= link_to activity.blog.name+" | 博客", user_blogs_path(:user_id=>activity.author_id,:host=>Setting.host_user), :class => "newsBlue ml15 mr5"%> + <% if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %> + 已设为首页 + <% end %>