dice/impress
1
0
Fork 0
forked from OpenNeo/impress
Code Pull requests Activity

Update syntax for set_inheritance_column

Browse source
This commit is contained in:
Matchu 2023-07-22 12:23:14 -07:00 committed by Matchu
parent fb332634a4
commit aa3d28c641
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/item.rb
View file

@ -1,7 +1,8 @@
class Item < ActiveRecord::Base class Item < ActiveRecord::Base
include PrettyParam include PrettyParam
set_inheritance_column 'inheritance_type' # PHP Impress used "type" to describe category # We use the `type` column to mean something other than what Rails means!
self.inheritance_column = nil
SwfAssetType = 'object' SwfAssetType = 'object'

5
app/models/swf_asset.rb
View file

@ -3,6 +3,9 @@ require 'uri'
require 'utf8' require 'utf8'
class SwfAsset < ActiveRecord::Base class SwfAsset < ActiveRecord::Base
# We use the `type` column to mean something other than what Rails means!
self.inheritance_column = nil
PUBLIC_ASSET_DIR = File.join('swfs', 'outfit') PUBLIC_ASSET_DIR = File.join('swfs', 'outfit')
LOCAL_ASSET_DIR = Rails.root.join('public', PUBLIC_ASSET_DIR) LOCAL_ASSET_DIR = Rails.root.join('public', PUBLIC_ASSET_DIR)
IMAGE_BUCKET = IMPRESS_S3.bucket('impress-asset-images') IMAGE_BUCKET = IMPRESS_S3.bucket('impress-asset-images')
@ -16,8 +19,6 @@ class SwfAsset < ActiveRecord::Base
# asset proxy instead. # asset proxy instead.
NEOPETS_IMAGES_URL_ORIGIN = ENV['NEOPETS_IMAGES_URL_ORIGIN'] || 'http://images.neopets.com' NEOPETS_IMAGES_URL_ORIGIN = ENV['NEOPETS_IMAGES_URL_ORIGIN'] || 'http://images.neopets.com'
set_inheritance_column 'inheritance_type'
IMAGE_SIZES = { IMAGE_SIZES = {
:small => [150, 150], :small => [150, 150],
:medium => [300, 300], :medium => [300, 300],