clean up stuff in js + do not display the internal asset collection in the assets section + fix ui bug with custom fields in the assets section

This commit is contained in:
dinedine 2010-09-15 17:48:10 +02:00
parent f458716c8a
commit 9533df3e43
11 changed files with 4 additions and 3 deletions

View File

@ -19,7 +19,7 @@ module Admin
protected
def set_collections
@asset_collections = current_site.asset_collections.order_by([[:name, :asc]])
@asset_collections = current_site.asset_collections.not_internal.order_by([[:name, :asc]])
end
end
end

View File

@ -25,6 +25,7 @@ class AssetCollection
## named scopes ##
scope :internal, :where => { :internal => true }
scope :not_internal, :where => { :internal => false }
## methods ##
@ -41,7 +42,7 @@ class AssetCollection
end
def self.find_or_create_internal(site)
site.asset_collections.internal.first || site.asset_collections.create(:name => t('.system_name'), :slug => 'system', :internal => true)
site.asset_collections.internal.first || site.asset_collections.create(:name => 'system', :slug => 'system', :internal => true)
end
protected

View File

@ -2,7 +2,7 @@
- content_for :head do
= javascript_include_tag 'admin/plugins/fancybox', 'admin/asset_collections', 'admin/custom_fields'
= stylesheet_link_tag 'admin/plugins/fancybox', 'admin/box'
= stylesheet_link_tag 'admin/plugins/fancybox', 'admin/fancybox_changes'
- content_for :submenu do
= render 'admin/shared/menu/assets'

Binary file not shown.

After

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 785 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 209 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 B