small fix for uploads
Oleg
committed Oct 15, 2010
commit 811fa44371316ca986b33de692b08dee8e077c94
Showing 4
changed files with
11 additions
and 10 deletions
app/controllers/cms_admin/layouts_controller.rb
+1
-2
| @@ | @@ -42,9 +42,8 @@ class CmsAdmin::LayoutsController < CmsAdmin::BaseController |
| protected | |
| def build_cms_layout | |
| - | @cms_layout = CmsLayout.new(params[:cms_layout]) |
| + | @cms_layout = @cms_site.cms_layouts.new(params[:cms_layout]) |
| @cms_layout.parent ||= CmsLayout.find_by_id(params[:parent_id]) | |
| - | @cms_layout.cms_site = @cms_site |
| end | |
| def load_cms_layout | |
app/controllers/cms_admin/pages_controller.rb
+1
-2
| @@ | @@ -47,10 +47,9 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController |
| protected | |
| def build_cms_page | |
| - | @cms_page = CmsPage.new(params[:cms_page]) |
| + | @cms_page = @cms_site.cms_pages.new(params[:cms_page]) |
| @cms_page.parent ||= (CmsPage.find_by_id(params[:parent_id]) || @cms_site.cms_pages.root) | |
| @cms_page.cms_layout ||= (@cms_page.parent && @cms_page.parent.cms_layout || @cms_site.cms_layouts.first) | |
| - | @cms_page.cms_site = @cms_site |
| end | |
| def load_cms_page | |
app/models/cms_upload.rb
+2
-0
| @@ | @@ -10,6 +10,8 @@ class CmsUpload < ActiveRecord::Base |
| belongs_to :cms_site | |
| # -- Validations ---------------------------------------------------------- | |
| + | validates :cms_site_id, |
| + | :presence => true |
| validates_attachment_presence :file | |
| # -- Instance Methods ----------------------------------------------------- | |
test/unit/cms_upload_test.rb
+7
-6
| @@ | @@ -11,20 +11,21 @@ class CmsUploadTest < ActiveSupport::TestCase |
| end | |
| def test_create | |
| - | assert_difference 'CmsUpload.count', 2 do |
| - | upload = CmsUpload.create(:file => fixture_file_upload('files/valid_image.jpg', 'image/jpeg')) |
| - | assert upload.image? |
| - | upload = CmsUpload.create(:uploaded_file => fixture_file_upload('files/valid_image.jpg')) |
| + | assert_difference 'CmsUpload.count' do |
| + | upload = cms_sites(:default).cms_uploads.create( |
| + | :uploaded_file => fixture_file_upload('files/valid_image.jpg') |
| + | ) |
| assert upload.image? | |
| end | |
| end | |
| def test_create_fails_on_invalid_file | |
| assert_no_difference 'CmsUpload.count' do | |
| - | upload = CmsUpload.create(:file => fixture_file_upload('files/invalid_file.gif', 'image/gif')) |
| + | upload = cms_sites(:default).cms_uploads.create( |
| + | :file => fixture_file_upload('files/invalid_file.gif', 'image/gif') |
| + | ) |
| assert upload.errors.present? | |
| assert_has_errors_on upload, :file | |
| end | |
| end | |
| - | |
| end | |