diff --git a/Gemfile b/Gemfile index e67b45d..fcbb129 100644 --- a/Gemfile +++ b/Gemfile @@ -54,6 +54,7 @@ end gem 'administrate' gem 'administrate-field-image' +gem 'administrate-field-color' gem 'dragonfly' gem 'dragonfly-s3_data_store' gem 'kaminari' diff --git a/Gemfile.lock b/Gemfile.lock index a33ccda..8b52a15 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,6 +48,9 @@ GEM rails (~> 4.2) sass-rails (~> 5.0) selectize-rails (~> 0.6) + administrate-field-color (0.0.1) + administrate (>= 0.2.0.rc1, < 0.3.0) + rails (~> 4.2) administrate-field-image (0.0.2) administrate (>= 0.2.0.rc1, < 0.3.0) rails (~> 4.2) @@ -319,6 +322,7 @@ PLATFORMS DEPENDENCIES administrate + administrate-field-color administrate-field-image aws-sdk better_errors diff --git a/app/dashboards/category_dashboard.rb b/app/dashboards/category_dashboard.rb index dac6abc..100e55a 100644 --- a/app/dashboards/category_dashboard.rb +++ b/app/dashboards/category_dashboard.rb @@ -15,7 +15,7 @@ class CategoryDashboard < Administrate::BaseDashboard created_at: Field::DateTime, updated_at: Field::DateTime, photo_id: Field::Number, - base_colour: ColourField, + base_colour: Field::Color, sort: Field::Number, slug: Field::String, } diff --git a/app/fields/colour_field.rb b/app/fields/colour_field.rb deleted file mode 100644 index 3bd853f..0000000 --- a/app/fields/colour_field.rb +++ /dev/null @@ -1,7 +0,0 @@ -require "administrate/field/base" - -class ColourField < Administrate::Field::Base - def to_s - data - end -end diff --git a/app/views/fields/colour_field/_form.html.erb b/app/views/fields/colour_field/_form.html.erb deleted file mode 100644 index 97460e7..0000000 --- a/app/views/fields/colour_field/_form.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -