0
@@ -52,6 +52,12 @@ class Admin::AssetsController < Admin::BaseController
0
       redirect_to(:controller => 'articles', :action => 'new')
0
   end
0
 
0
+  def destroy
0
+    @asset.destroy
0
+    redirect_to assets_path
0
+    flash[:notice] = "Deleted '#{@asset.filename}'"
0
+  end
0
+
0
   protected
0
     def find_asset
0
       @asset = site.assets.find(params[:id])

0
@@ -3,12 +3,7 @@
0
     <tr>
0
     <% @recent.each do |asset| -%>
0
       <td>
0
-        <ul class="file-tools clear">
0
-          <li class="fedit"><%= link_to 'Edit', edit_asset_url(asset), :title => 'Edit this file' %></li>
0
-          <li class="fdelete"><a href="#" title="Delete this file">Delete</a></li>
0
-          <li class="fbucket"><a href="#" title="Put in bucket">Add to bucket</a></li>
0
-        </ul>
0
-        <%= link_to(asset_image_for(asset, :thumb), asset.public_filename, :target => '_blank') %>
0
+        <%= render :partial => 'asset', :object => asset if asset %>
0
       </td>
0
     <% end -%>
0
     </tr>
0
@@ -21,14 +16,7 @@
0
     <tr>
0
       <% assets_line.each do |asset| %>
0
        <td>
0
-         <% if asset %>
0
-         <ul class="file-tools clear">
0
-           <li class="fedit"><%= link_to 'Edit', edit_asset_url(asset), :title => 'Edit this file' %></li>
0
-           <li class="fdelete"><a href="#" title="Delete this file">Delete</a></li>
0
-           <li class="fbucket"><a href="#" title="Put in bucket">Add to bucket</a></li>
0
-         </ul>
0
-         <%= link_to(asset_image_for(asset, :tiny), asset.public_filename, :target => '_blank') %>
0
-         <% end %>
0
+         <%= render :partial => 'asset', :object => asset if asset %>
0
         </td>
0
        <% end %>
0
     </tr>

0
@@ -84,9 +84,14 @@ class Admin::AssetsControllerTest < Test::Unit::TestCase
0
     assert_equal [], assigns(:recent)
0
   end
0
 
0
-  #def test_should_search_for_images_by_title_and_tag
0
-  #  
0
-  #end
0
+  def test_should_delete_asset
0
+    assert_difference Asset, :count, -1 do
0
+      delete :destroy, :id => assets(:gif).id
0
+    end
0
+    # fixed in edge
0
+    #assert_redirected_to assets_path
0
+    assert_flash :notice
0
+  end
0
 
0
   def teardown
0
     FileUtils.rm_rf ASSET_PATH