Merge 7922:8377 from trunk.

[rails.git] / app / views / trace / view.rhtml

diff --git a/app/views/trace/view.rhtml b/app/views/trace/view.rhtml
index 021b536e8ef3b25ec868f714b9e9e6650dbf7ed5..f547f05db4ddeafd85fc1ad4e90888d5026317f9 100644 (file)
--- a/app/views/trace/view.rhtml
+++ b/app/views/trace/view.rhtml
@@ -1,6 +1,10 @@
 <h2><%= h(@title) %></h2>
 
 <h2><%= h(@title) %></h2>
 

-<img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
+  <% if @trace.inserted %>
+    <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :display_name => @trace.user.display_name %>">
+  <% else %>
+    <span style="color:red">PENDING</span>
+  <% end %>

 
 <table border="0">
   <tr>
 
 <table border="0">
   <tr>


@@ -22,7 +26,7 @@
   <% end %>
   <tr>
     <td>Owner:</td>
   <% end %>
   <tr>
     <td>Owner:</td>

-    <td><%= link_to g(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></td>
+    <td><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></td>

   </tr>
   <tr>
     <td>Description:</td>
   </tr>
   <tr>
     <td>Description:</td>