Download as
Browse Code »

Commit 415c307cf50ad835a0790a9d962b4298c4127cca

Authored by Antonio Terceiro
1 parent c4e8c606
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

s/named_scope/scope/

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/models/category.rb
  Diff comments   View file @415c307
@@ -20,13 +20,13 @@ class Category < ActiveRecord::Base @@ -20,13 +20,13 @@ class Category < ActiveRecord::Base
20 {:conditions => ['parent_id is null and environment_id = ?', environment.id ]} 20 {:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
21 } 21 }
22 22
23 - named_scope :on_level, lambda { |parent| {:conditions => {:parent_id => parent}} } 23 + scope :on_level, lambda { |parent| {:conditions => {:parent_id => parent}} }
24 24
25 - named_scope :sub_categories, lambda { |category| 25 + scope :sub_categories, lambda { |category|
26 {:conditions => ['categories.path LIKE ? AND categories.id != ?', "%#{category.slug}%", category.id]} 26 {:conditions => ['categories.path LIKE ? AND categories.id != ?', "%#{category.slug}%", category.id]}
27 } 27 }
28 28
29 - named_scope :sub_tree, lambda { |category| 29 + scope :sub_tree, lambda { |category|
30 {:conditions => ['categories.path LIKE ?', "%#{category.slug}%"]} 30 {:conditions => ['categories.path LIKE ?', "%#{category.slug}%"]}
31 } 31 }
32 32
app/models/product.rb
  Diff comments   View file @415c307
@@ -38,7 +38,7 @@ class Product < ActiveRecord::Base @@ -38,7 +38,7 @@ class Product < ActiveRecord::Base
38 38
39 scope :more_recent, :order => "created_at DESC" 39 scope :more_recent, :order => "created_at DESC"
40 40
41 - named_scope :from_category, lambda { |category| 41 + scope :from_category, lambda { |category|
42 {:joins => :product_category, :conditions => ['categories.path LIKE ?', "%#{category.slug}%"]} if category 42 {:joins => :product_category, :conditions => ['categories.path LIKE ?', "%#{category.slug}%"]} if category
43 } 43 }
44 44