don't check authorization everywhere

[rails.git] / app / views / traces / list.html.erb

diff --git a/app/views/traces/list.html.erb b/app/views/traces/list.html.erb
index 4c433ce66538e82c3025750511df01d4817138a1..3cd90f3e7345894f7144212a92caf56c46a30138 100644 (file)
--- a/app/views/traces/list.html.erb
+++ b/app/views/traces/list.html.erb
@@ -3,7 +3,7 @@
   <ul class='secondary-actions clearfix'>
     <li><%= t('.description') %></li>
     <li><%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %></li>
   <ul class='secondary-actions clearfix'>
     <li><%= t('.description') %></li>
     <li><%= rss_link_to :action => 'georss', :display_name => @display_name, :tag => @tag %></li>

-    <li><%= link_to t('.upload_trace'), :action => 'create' %></li>
+    <li><%= link_to t('.upload_trace'), new_trace_path %></li>

     <% if @tag %>
       <li><%= link_to t('.see_all_traces'), :controller => 'traces', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
       <li><%= link_to t('.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %></li>
     <% if @tag %>
       <li><%= link_to t('.see_all_traces'), :controller => 'traces', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
       <li><%= link_to t('.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %></li>


@@ -11,8 +11,8 @@
       <% if @display_name %>
         <li><%= link_to t('.see_all_traces'), :controller => 'traces', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
       <% end %>
       <% if @display_name %>
         <li><%= link_to t('.see_all_traces'), :controller => 'traces', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
       <% end %>

-      <%= unless_user(@target_user, :li) do %>
-        <%= link_to t('.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %>
+      <% if current_user && current_user != @target_user %>
+        <li><%= link_to t('.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %></li>

       <% end %>
     <% end %>
   </ul>
       <% end %>
     <% end %>
   </ul>


@@ -39,7 +39,7 @@
 
   <%= render :partial => 'trace_paging_nav' %>
 <% else %>
 
   <%= render :partial => 'trace_paging_nav' %>
 <% else %>

-  <h4><%= t '.empty_html', :upload_link => trace_create_path %></h4>
+  <h4><%= t '.empty_html', :upload_link => new_trace_path %></h4>

 <% end %>
 
 <%= render :partial => 'trace_optionals' %>
 <% end %>
 
 <%= render :partial => 'trace_optionals' %>