main css conflict
This commit is contained in:
@@ -12,7 +12,7 @@ def prepare_items_for_mass_display(items)
|
||||
end
|
||||
|
||||
def offset_and_limit_invalid?(offset, limit)
|
||||
offset < 0 or limit <= 0 or limit > 100
|
||||
offset < 0 or limit <= 0 or limit > 300
|
||||
end
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
class AddDecorationToItem < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :items, :decoration, :string
|
||||
end
|
||||
end
|
||||
@@ -11,7 +11,7 @@
|
||||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 20150726161256) do
|
||||
ActiveRecord::Schema.define(version: 20151124061357) do
|
||||
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
@@ -135,6 +135,7 @@ ActiveRecord::Schema.define(version: 20150726161256) do
|
||||
t.decimal "weight", precision: 5, scale: 3
|
||||
t.integer "delivery_time_estimation_id"
|
||||
t.integer "brand_id"
|
||||
t.string "decoration"
|
||||
end
|
||||
|
||||
create_table "link_banners", force: :cascade do |t|
|
||||
|
||||
@@ -8,7 +8,8 @@ class MultiMediaDescription < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def resized_url
|
||||
url.gsub('/upload/v','/upload/c_lpad,h_281,w_375/v')
|
||||
decoration_slug = item.decoration.present? ? "/#{item.decoration}" : ""
|
||||
url.gsub('/upload/v',"/upload/c_lpad,h_281,w_375#{decoration_slug}/v")
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user