diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index b70d73eb6..068390192 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -72,7 +72,7 @@ <% end %> -

<%= textilizable act.notes %>

+

<%= textAreailizable act.notes %>

<%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %>
@@ -113,7 +113,7 @@ -

<%= act.description.html_safe %>

+

<%=textAreailizable act, :description %>

@@ -141,7 +141,7 @@ <% if act.notes.nil? %> <% desStr = '' %> <% else %> - <% desStr=act.notes.html_safe %> + <% desStr= textAreailizable(act, :notes) %> <% end %>

<%= desStr %>

@@ -168,7 +168,7 @@ -

<%= act.long_comments.html_safe %>

+

<%= textAreailizable act,:long_comments %>

@@ -194,7 +194,7 @@ -

<%= h act.content.truncate(240, omission: '...') %>

+

<%= textAreailizable(act,:content) %>

@@ -242,7 +242,7 @@ -

<%= act.description.html_safe %>

+

<%= textAreailizable act,:description %>

@@ -287,7 +287,7 @@ --> - <%= textilizable act, :description %> + <%= textAreailizable act, :description %> @@ -314,7 +314,7 @@ <% end %> -

<%= h act.description %>

+

<%= textAreailizable act, :description %>

@@ -384,7 +384,7 @@ -

<%= textilizable e.notes %>

+

<%= textAreailizable e.notes %>

diff --git a/app/views/users/user_activities.html.erb b/app/views/users/user_activities.html.erb index 2b4cf8819..080e772a1 100644 --- a/app/views/users/user_activities.html.erb +++ b/app/views/users/user_activities.html.erb @@ -13,7 +13,7 @@ <%# end -%> <%# end -%> - + <%# end %> -->