Download as
Browse Code »

Commit 47bee664ac11084bce3a5b199099044e0d496591

Authored by Rodrigo Souto
1 parent b4e68a4a
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

container_block: destroy box after container is destroyed

Showing 3 changed files with 13 additions and 1 deletions   Show diff stats
plugins/container_block/controllers/container_block_plugin_controller.rb
  Diff comments   View file @47bee66
1 module ContainerBlockPluginController 1 module ContainerBlockPluginController
2 - 2 +
3 def saveWidths 3 def saveWidths
4 container = boxes_holder.blocks.find(params[:id]) 4 container = boxes_holder.blocks.find(params[:id])
5 pairs = params[:widths].split('|') 5 pairs = params[:widths].split('|')
plugins/container_block/lib/container_block_plugin/container_block.rb
  Diff comments   View file @47bee66
@@ -2,6 +2,7 @@ class ContainerBlockPlugin::ContainerBlock < Block @@ -2,6 +2,7 @@ class ContainerBlockPlugin::ContainerBlock < Block
2 2
3 after_create :create_box 3 after_create :create_box
4 after_destroy :destroy_children 4 after_destroy :destroy_children
  5 + after_destroy :destroy_box
5 6
6 settings_items :container_box_id, :type => Integer, :default => nil 7 settings_items :container_box_id, :type => Integer, :default => nil
7 settings_items :children_settings, :type => Hash, :default => {} 8 settings_items :children_settings, :type => Hash, :default => {}
@@ -28,6 +29,10 @@ class ContainerBlockPlugin::ContainerBlock < Block @@ -28,6 +29,10 @@ class ContainerBlockPlugin::ContainerBlock < Block
28 save! 29 save!
29 end 30 end
30 31
  32 + def destroy_box
  33 + container_box.destroy
  34 + end
  35 +
31 def container_box 36 def container_box
32 Box.find(container_box_id) 37 Box.find(container_box_id)
33 end 38 end
plugins/container_block/test/unit/container_block_plugin/container_block_test.rb
  Diff comments   View file @47bee66
@@ -81,4 +81,11 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase @@ -81,4 +81,11 @@ class ContainerBlockPlugin::ContainerBlockTest < ActiveSupport::TestCase
81 assert !Block.exists?(child.id) 81 assert !Block.exists?(child.id)
82 end 82 end
83 83
  84 + should 'destroy box when container is removed' do
  85 + @block.save!
  86 + assert_difference Box, :count, -1 do
  87 + @block.destroy
  88 + end
  89 + end
  90 +
84 end 91 end