update

shu0115 · Apr 11, 2012 · 8b806b6 · 8b806b6
1 parent a7d994f
commit 8b806b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -36,14 +36,9 @@
 <br /><br />
 
 <%# 通知／エラーメッセージ %>
-<% unless flash[:notice].blank? %>
-  <p style="color: green;"><%=raw flash[:notice] %></p>
-<% end %>
+<%= simple_format( flash[:notice], style: "color: green;" ) unless flash[:notice].blank? %>
+<%= simple_format( flash[:alert], style: "color: red;" ) unless flash[:alert].blank? %>
 
-<% unless flash[:alert].blank? %>
-  <p style="color: red;"><%=raw flash[:alert] %></p>
-<% end %>
-  
 <%= yield %>
 
 </body>

diff --git a/app/views/tweets/batch.html.erb b/app/views/tweets/batch.html.erb
@@ -42,7 +42,7 @@
     <td style="white-space: nowrap;" rowspan="<%= room_count %>"><%= batch.total_count %></td>
 
     <%# Result %>
-    <% batch_row = batch.result.split("\n") %>
+    <% batch_row = batch.result.to_s.split("\n") %>
     <%# 行ループ %>
     <% batch_row.each{ |row| %>
     <tr>