beef-has_assets 0.7.0 → 0.7.1

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/app/controllers/admin/assets_controller.rb

@@ -41,7 +41,13 @@ class Admin::AssetsController < Admin::BaseController
   end
 
   def category
-    @assets = Asset.all(:conditions => ["category = ?",params[:category].rstrip])
+    category = params[:category].strip
+    if category == 'No Folder'
+      conditions = "category IS NULL or category = ''"
+    else
+      conditions = ["category = ?", category]
+    end
+    @assets = Asset.not_thumbnails.all( :conditions => conditions )
 
     respond_to do |format|
       format.html { render :layout => false}

data/app/views/admin/assets/_document.html.erb

@@ -1,12 +1,17 @@
+<% attached = (controller.action_name == 'attach' or controller.controller_name != 'assets') %>
 <%= link_to_function truncate(asset.filename,{:length => 50}), "AssetBrowser.openInfo(#{asset.id}, this)" %> - <%= asset.description %>
 <div>
-  <%= link_to_function "View Info<br/>", "AssetBrowser.openInfo(#{asset.id}, this)" %> 
-  <% if for_content -%>
-	<%= link_to_function "Insert<br/>", "addAsset(#{asset.id})" %>
-  	<%= link_to_function "Attach", "AssetBrowser.addAssetToContentNode(#{asset.to_json}.#{asset.class.name.demodulize.underscore})" %>  
-  <% elsif controller.controller_name != 'assets' %>
-  	<%= link_to_function "Detach", "AssetBrowser.removeAssetFromContentNode(#{asset.id})" %>
-  <% else %>
-	<%= link_to_function "Delete", "AssetBrowser.assetAction(#{asset.to_json}.#{asset.class.name.demodulize.underscore})" %>
-  <% end -%>
+<%= link_to_function "View Info", "AssetBrowser.openInfo(#{asset.id}, this)" %><br/>
+
+<% if for_content or attached %>
+  <%= link_to_function "Insert", "addAsset(#{asset.id})" %></br>
+<% end -%>
+<br/>
+<% if for_content %>
+  <%= link_to_function "Attach", "AssetBrowser.addAssetToContentNode(#{asset.to_json}.#{asset.class.name.demodulize.underscore})" %>
+<% elsif attached %>
+  <%= link_to_function "Detach", "AssetBrowser.removeAssetFromContentNode(#{asset.id})" %>
+<% else %>
+  <%= link_to_function "Delete", "AssetBrowser.assetAction(#{asset.to_json}.#{asset.class.name.demodulize.underscore})" %>
+<% end -%>
 </div>

data/app/views/admin/assets/_image.html.erb

@@ -1,19 +1,20 @@
+<% attached = (controller.action_name == 'attach' or controller.controller_name != 'assets') %>
 <%= image_tag asset.public_filename(:square) %>
 <div>
   <h4><%= truncate(asset.filename,{:length => 50}) %></h4>
   <%= link_to_function "View Info", "AssetBrowser.openInfo(#{asset.id}, this)" %><br />
-  
-  <% if for_content -%>
-  <%= link_to_function "Attach", "AssetBrowser.addAssetToContentNode(#{asset.to_json}.#{asset.class.name.demodulize.underscore})" %>
-  <h4>Insert Image</h4>
-  <%= link_to_function "Large", "addAsset(#{asset.id}, 'large' )" %> | <%= link_to_function "Medium ", "addAsset(#{asset.id}, 'medium' )" %> | <%= link_to_function "Small ", "addAsset(#{asset.id}, 'thumb' )" %>
 
-  <% elsif controller.controller_name != 'assets' %>
-
-  <%= link_to_function "Detach", "AssetBrowser.removeAssetFromContentNode(#{asset.id})" %>
+<% if for_content or attached %>
   <h4>Insert Image</h4>
-  <%= link_to_function "Large", "addAsset(#{asset.id}, 'large' )"  %> | <%= link_to_function "Medium ", "addAsset(#{asset.id}, 'medium' )" %> | <%= link_to_function "Small ", "addAsset(#{asset.id}, 'thumb' )" %>
-  <% else %>
+  <%= link_to_function "Large", "addAsset(#{asset.id}, 'large' )" %> | <%= link_to_function "Medium ", "addAsset(#{asset.id}, 'medium' )" %> | <%= link_to_function "Small ", "addAsset(#{asset.id}, 'thumb' )" %><br/>
+<% end -%>
+<br/>
+<% if for_content %>
+  <%= link_to_function "Attach", "AssetBrowser.addAssetToContentNode(#{asset.to_json}.#{asset.class.name.demodulize.underscore})" %>
+<% elsif attached %>
+  <%= link_to_function "Detach", "AssetBrowser.removeAssetFromContentNode(#{asset.id})" %>
+<% else %>
   <%= link_to_function "Delete", "AssetBrowser.assetAction(#{asset.to_json}.#{asset.class.name.demodulize.underscore})" %>
-  <% end -%>
+<% end -%>
+
 </div>

data/beef-has_assets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-has_assets}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-01-26}
+  s.date = %q{2010-02-09}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-has_assets
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 +00:00
+date: 2010-02-09 00:00:00 +00:00
 default_executable: 
 dependencies: []