diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 1318e40a5..b64c18b33 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -16,7 +16,6 @@ class TagsController < ApplicationController include ActsAsTaggableOn::TagsHelper helper :projects helper :courses - include TagsHelper helper :tags include OpenSourceProjectsHelper diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 017a9a03c..b7e5e2749 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -1,3 +1,9 @@ +
<%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb index 6996e8891..3efbfcc1a 100644 --- a/app/views/tags/_tag_name.html.erb +++ b/app/views/tags/_tag_name.html.erb @@ -7,7 +7,7 @@ // }); // }) - + <% @tags = obj.reload.tag_list %> <% if non_list_all and (@tags.size > 0) %>