diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 5e99a15..82609e9 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,4 +14,5 @@ //= require jquery_ujs //= require turbolinks //= require active_scaffold +//= require cloudinary //= require_tree . diff --git a/app/controllers/multi_media_descriptions_controller.rb b/app/controllers/multi_media_descriptions_controller.rb index 5dc6da7..33799c1 100644 --- a/app/controllers/multi_media_descriptions_controller.rb +++ b/app/controllers/multi_media_descriptions_controller.rb @@ -1,5 +1,6 @@ class MultiMediaDescriptionsController < ApplicationController active_scaffold :"multi_media_description" do |conf| conf.columns[:media_type].form_ui = :select + end end diff --git a/app/helpers/items_helper.rb b/app/helpers/items_helper.rb index f057aa6..f2092c6 100644 --- a/app/helpers/items_helper.rb +++ b/app/helpers/items_helper.rb @@ -1,4 +1,5 @@ module ItemsHelper + end \ No newline at end of file diff --git a/app/helpers/multi_media_descriptions_helper.rb b/app/helpers/multi_media_descriptions_helper.rb index 4fdfa59..ec57c2a 100644 --- a/app/helpers/multi_media_descriptions_helper.rb +++ b/app/helpers/multi_media_descriptions_helper.rb @@ -1,2 +1,3 @@ module MultiMediaDescriptionsHelper + end \ No newline at end of file diff --git a/app/models/item.rb b/app/models/item.rb index edcf40e..50be2e1 100644 --- a/app/models/item.rb +++ b/app/models/item.rb @@ -1,4 +1,6 @@ class Item < ActiveRecord::Base belongs_to :unit has_many :multi_media_descriptions + + validates_presence_of :name, :description, :list_price, :current_input_price, :tags, :unit_id, :code end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 44447a6..cb7c922 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,6 +4,7 @@ Ribica Back Office <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <%= cloudinary_js_config %> <%= csrf_meta_tags %>