Download as
Browse Code »

Commit b87e8539bd89d9e92621b6fd3c00b0579c352197

Authored by Daniel Cunha
Committed by Daniela Feitosa
1 parent 7fbb381d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Changing acceptable_center_blocks and acceptable_side_blocks instance methods to class methods

Showing 1 changed file with 59 additions and 58 deletions   Show diff stats
app/models/box.rb
  Diff comments   View file @b87e853
... ... @@ -4,73 +4,74 @@ class Box < ActiveRecord::Base
4 4 has_many :blocks, :dependent => :destroy, :order => 'position'
5 5  
6 6 def acceptable_blocks
7   - to_css_class_name (position == 1) ? acceptable_center_blocks : acceptable_side_blocks
  7 + to_css_class_name central? ? Box.acceptable_center_blocks : Box.acceptable_side_blocks
8 8 end
9 9  
10   - private
  10 + def central?
  11 + position == 1
  12 + end
11 13  
12   - def acceptable_center_blocks
13   - %w{
14   - ArticleBlock
15   - BlogArchivesBlock
16   - CategoriesBlock
17   - CommunitiesBlock
18   - EnterprisesBlock
19   - EnvironmentStatisticsBlock
20   - FansBlock
21   - FavoriteEnterprisesBlock
22   - FeedReaderBlock
23   - FriendsBlock
24   - HighlightsBlock
25   - LinkListBlock
26   - LoginBlock
27   - MainBlock
28   - MembersBlock
29   - MyNetworkBlock
30   - PeopleBlock
31   - ProfileImageBlock
32   - RawHTMLBlock
33   - RecentDocumentsBlock
34   - SellersSearchBlock
35   - TagsBlock
36   - }
  14 + def self.acceptable_center_blocks
  15 + [ ArticleBlock,
  16 + BlogArchivesBlock,
  17 + CategoriesBlock,
  18 + CommunitiesBlock,
  19 + EnterprisesBlock,
  20 + EnvironmentStatisticsBlock,
  21 + FansBlock,
  22 + FavoriteEnterprisesBlock,
  23 + FeedReaderBlock,
  24 + FriendsBlock,
  25 + HighlightsBlock,
  26 + LinkListBlock,
  27 + LoginBlock,
  28 + MainBlock,
  29 + MembersBlock,
  30 + MyNetworkBlock,
  31 + PeopleBlock,
  32 + ProfileImageBlock,
  33 + RawHTMLBlock,
  34 + RecentDocumentsBlock,
  35 + SellersSearchBlock,
  36 + TagsBlock ]
37 37 end
38 38  
39   - def acceptable_side_blocks
40   - %w{
41   - ArticleBlock
42   - BlogArchivesBlock
43   - CategoriesBlock
44   - CommunitiesBlock
45   - DisabledEnterpriseMessageBlock
46   - EnterprisesBlock
47   - EnvironmentStatisticsBlock
48   - FansBlock
49   - FavoriteEnterprisesBlock
50   - FeaturedProductsBlock
51   - FeedReaderBlock
52   - FriendsBlock
53   - HighlightsBlock
54   - LinkListBlock
55   - LocationBlock
56   - LoginBlock
57   - MembersBlock
58   - MyNetworkBlock
59   - PeopleBlock
60   - ProductsBlock
61   - ProfileImageBlock
62   - ProfileInfoBlock
63   - ProfileSearchBlock
64   - RawHTMLBlock
65   - RecentDocumentsBlock
66   - SellersSearchBlock
67   - SlideshowBlock
  39 + def self.acceptable_side_blocks
  40 + [ ArticleBlock,
  41 + BlogArchivesBlock,
  42 + CategoriesBlock,
  43 + CommunitiesBlock,
  44 + DisabledEnterpriseMessageBlock,
  45 + EnterprisesBlock,
  46 + EnvironmentStatisticsBlock,
  47 + FansBlock,
  48 + FavoriteEnterprisesBlock,
  49 + FeaturedProductsBlock,
  50 + FeedReaderBlock,
  51 + FriendsBlock,
  52 + HighlightsBlock,
  53 + LinkListBlock,
  54 + LocationBlock,
  55 + LoginBlock,
  56 + MembersBlock,
  57 + MyNetworkBlock,
  58 + PeopleBlock,
  59 + ProductsBlock,
  60 + ProfileImageBlock,
  61 + ProfileInfoBlock,
  62 + ProfileSearchBlock,
  63 + RawHTMLBlock,
  64 + RecentDocumentsBlock,
  65 + SellersSearchBlock,
  66 + SlideshowBlock,
68 67 TagsBlock
69   - }
  68 + ]
70 69 end
71 70  
  71 + private
  72 +
72 73 def to_css_class_name(blocks)
73   - blocks.map{ |block| block.underscore.tr('_', '-') }
  74 + blocks.map{ |block| block.to_s.underscore.tr('_', '-') }
74 75 end
75 76  
76 77 end
... ...