beef-has_assets 0.6.2 → 0.6.3

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/app/controllers/admin/assets_controller.rb

@@ -49,6 +49,16 @@ class Admin::AssetsController < Admin::BaseController
       format.js { render :layout => false}
     end
   end
+
+  def content_type
+    @assets = Asset.not_thumbnails.all(:conditions => ["content_type = ?",params[:category]])
+
+    respond_to do |format|
+      format.html { render :layout => false, :action => 'category'}
+      format.xml  { @assets.to_xml }
+      format.js { render :layout => false, :action => 'category'}
+    end
+  end
   
   def descriptions
     @descriptions = Asset.not_thumbnails.find(:all, :select => 'description', :group => 'description', :order => 'description', :conditions => 'description IS NOT NULL')

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

@@ -8,10 +8,9 @@
   <dd id="<%= asset_type.parameterize %>-description">
     <h3 class="type-heading"><%= asset_type %></h3>
     <ul id="<%= asset_type.parameterize %>-list" class="asset-list">
-<%= render :partial => "admin/assets/category_contents", :locals => { :assets => assets, :for_content => for_content } unless ajaxify %>
     </ul>
   </dd>
 <% end -%>
 </dl>
-<%= javascript_tag "new AssetBrowser('#{@grouping}', '#{params[:folder]}', #{for_content.to_s}, #{ajaxify.to_s});" %>
+<%= javascript_tag "new AssetBrowser('#{(@grouping || 'by_category')}', '#{params[:folder]}', #{for_content.to_s});" %>
 

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

@@ -1,7 +1,7 @@
 <h1>Browse for Files</h1>
 <%= toggle_grouping_links %>
 <div id="main-browser">
-<%= render :partial => 'browser', :locals => { :ajaxify => true, :asset_types => @asset_types, :for_content => false } %>
+<%= render :partial => 'browser', :locals => { :asset_types => @asset_types, :for_content => false } %>
 </div>
 
 <% content_for :sub_content do  %>

data/beef-has_assets.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{beef-has_assets}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2009-10-28}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -74,8 +74,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Rails Engine. Adds uploadable assets to a model and admin area for files}
   s.test_files = [
-    "test/has_assets_test.rb",
-     "test/test_helper.rb"
+    "test/test_helper.rb",
+     "test/has_assets_test.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -88,3 +88,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/config/routes.rb

@@ -1,6 +1,6 @@
 ActionController::Routing::Routes.draw do |map|
   map.namespace(:admin) do |admin|
     admin.resources :flickrs
-    admin.resources :assets, :collection => { :by_content_type => :get, :descriptions => :get, :by_category => :get, :categories => :get, :category => :get }, :member => { :set_lead => :put, :rename_category => :post }
+    admin.resources :assets, :collection => { :by_content_type => :get, :descriptions => :get, :by_category => :get, :categories => :get, :category => :get, :content_type => :get }, :member => { :set_lead => :put, :rename_category => :post }
   end
 end

data/generators/assets_admin_files/templates/public/javascripts/admin/assets.js

@@ -1,11 +1,10 @@
 var AssetBrowser = Class.create({
-  initialize: function(grouping, folder, for_content, ajax) {
+  initialize: function(grouping, folder, for_content) {
     AssetBrowser.current_grouping = grouping;
     AssetBrowser.dl = $('asset-browser');
     AssetBrowser.setContentNodeForm('has-assets-form');
     AssetBrowser.dts = AssetBrowser.dl.select('dt');
     AssetBrowser.open_folder = folder;
-    AssetBrowser.ajax = (ajax || false);
     AssetBrowser.for_content = (for_content || false);
         
     AssetBrowser.dts.each(function(dt) {
@@ -15,7 +14,7 @@ var AssetBrowser = Class.create({
         dt.onclick = function() {
           AssetBrowser.closeInfo();
 
-          if(AssetBrowser.ajax && !this.dd.visible() && !dt.dd.down('ul li'))
+          if(!this.dd.visible() && !dt.dd.down('ul li'))
             AssetBrowser.loadFilesByFolder(dt.innerHTML, dt.dd.down('ul').id);
 
 
@@ -105,7 +104,7 @@ Object.extend(AssetBrowser, {
   },
   
   loadFilesByFolder: function(folder_name, folder_id){
-      new Ajax.Request('/admin/assets/category', { method: 'get',
+      new Ajax.Request('/admin/assets/' + this.current_grouping.replace(/$by_/, ''), { method: 'get',
                                                      asynchronous:true, 
                                                      parameters: { for_content: AssetBrowser.for_content, format: 'html', category: folder_name, authenticity_token: AJ.authenticity_token() },
                                                      onSuccess: function(response){ $(folder_id).update(response.responseText); } } );

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-has_assets
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 +00:00
+date: 2009-10-28 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -103,5 +103,5 @@ signing_key:
 specification_version: 3
 summary: Rails Engine. Adds uploadable assets to a model and admin area for files
 test_files: 
-- test/has_assets_test.rb
 - test/test_helper.rb
+- test/has_assets_test.rb