Skip to content

COR-736: Error Message on New Fields #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ElliottAYoung merged 2 commits into from
Apr 25, 2017
Merged

COR-736: Error Message on New Fields #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b41061
feat: add JS for required attribute
ElliottAYoung Apr 21, 2017
0914696
bump: cortex-plugins-core to 0.11.3
ElliottAYoung Apr 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem 'rails', '~> 5.0.1'

# Cortex-specific
gem 'cortex-exceptions', '= 0.0.4'
gem 'cortex-plugins-core', '= 0.11.2'
gem 'cortex-plugins-core', '= 0.11.3'

# API
gem 'grape', '~> 0.17'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ GEM
concurrent-ruby (1.0.4)
connection_pool (2.2.1)
cortex-exceptions (0.0.4)
cortex-plugins-core (0.11.2)
cortex-plugins-core (0.11.3)
cells (~> 4.1)
cells-haml (~> 0.0.10)
cells-rails (~> 0.0.6)
Expand Down Expand Up @@ -734,7 +734,7 @@ DEPENDENCIES
cells-rails (~> 0.0.7)
codeclimate-test-reporter (~> 0.6)
cortex-exceptions (= 0.0.4)
cortex-plugins-core (= 0.11.2)
cortex-plugins-core (= 0.11.3)
database_cleaner (~> 1.5)
deep_cloneable (~> 2.2.2)
devise (~> 4.2.0)
Expand Down
1 change: 1 addition & 0 deletions app/assets/javascripts/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

//= require base
//= require datepicker_init
//= require form
//= require flash
//= require media_dialogs
//= require sidebar-toggle
Expand Down
6 changes: 6 additions & 0 deletions app/assets/javascripts/form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
var requiredFormField = function() {
$('input[data-required=true]').attr('required', true);
}

$(document).ready(requiredFormField);
$(document).on('page:load', requiredFormField);
162 changes: 76 additions & 86 deletions db/schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20170327182543) do
ActiveRecord::Schema.define(version: 20170417185915) do

# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
Expand Down Expand Up @@ -58,19 +58,14 @@
end

create_table "categories", force: :cascade do |t|
t.string "name"
t.integer "user_id", null: false
t.string "name", limit: 255
t.integer "user_id", null: false
t.integer "parent_id"
t.integer "lft"
t.integer "rgt"
t.integer "depth"
t.datetime "created_at"
t.datetime "updated_at"
t.index ["depth"], name: "index_categories_on_depth", using: :btree
t.index ["lft"], name: "index_categories_on_lft", using: :btree
t.index ["parent_id"], name: "index_categories_on_parent_id", using: :btree
t.index ["rgt"], name: "index_categories_on_rgt", using: :btree
t.index ["user_id"], name: "index_categories_on_user_id", using: :btree
end

create_table "categories_posts", id: false, force: :cascade do |t|
Expand Down Expand Up @@ -213,24 +208,23 @@
end

create_table "media", force: :cascade do |t|
t.string "name"
t.string "name", limit: 255
t.integer "user_id"
t.string "attachment_file_name"
t.string "attachment_content_type"
t.string "attachment_file_name", limit: 255
t.string "attachment_content_type", limit: 255
t.integer "attachment_file_size"
t.datetime "attachment_updated_at"
t.string "dimensions"
t.string "dimensions", limit: 255
t.text "description"
t.string "alt"
t.string "alt", limit: 255
t.boolean "active"
t.datetime "deactive_at"
t.datetime "created_at"
t.datetime "updated_at"
t.string "digest"
t.string "digest", limit: 255
t.datetime "deleted_at"
t.hstore "meta"
t.string "type", default: "Media", null: false
t.index ["name"], name: "index_media_on_name", using: :btree
t.string "type", limit: 255, default: "Media", null: false
t.index ["user_id"], name: "index_media_on_user_id", using: :btree
end

Expand All @@ -240,48 +234,48 @@
end

create_table "oauth_access_grants", force: :cascade do |t|
t.integer "resource_owner_id", null: false
t.integer "application_id", null: false
t.string "token", null: false
t.integer "expires_in", null: false
t.text "redirect_uri", null: false
t.datetime "created_at", null: false
t.integer "resource_owner_id", null: false
t.integer "application_id", null: false
t.string "token", limit: 255, null: false
t.integer "expires_in", null: false
t.text "redirect_uri", null: false
t.datetime "created_at", null: false
t.datetime "revoked_at"
t.string "scopes"
t.string "scopes", limit: 255
t.index ["token"], name: "index_oauth_access_grants_on_token", unique: true, using: :btree
end

create_table "oauth_access_tokens", force: :cascade do |t|
t.integer "resource_owner_id"
t.integer "application_id"
t.string "token", null: false
t.string "refresh_token"
t.string "token", limit: 255, null: false
t.string "refresh_token", limit: 255
t.integer "expires_in"
t.datetime "revoked_at"
t.datetime "created_at", null: false
t.string "scopes"
t.datetime "created_at", null: false
t.string "scopes", limit: 255
t.index ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true, using: :btree
t.index ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", using: :btree
t.index ["token"], name: "index_oauth_access_tokens_on_token", unique: true, using: :btree
end

create_table "oauth_applications", force: :cascade do |t|
t.string "name", null: false
t.string "uid", null: false
t.string "secret", null: false
t.text "redirect_uri", null: false
t.string "name", limit: 255, null: false
t.string "uid", limit: 255, null: false
t.string "secret", limit: 255, null: false
t.text "redirect_uri", null: false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "owner_id"
t.string "owner_type"
t.string "scopes", default: "", null: false
t.string "owner_type", limit: 255
t.string "scopes", default: "", null: false
t.index ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type", using: :btree
t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree
end

create_table "onet_occupations", force: :cascade do |t|
t.string "soc"
t.string "title"
t.string "soc", limit: 255
t.string "title", limit: 255
t.text "description"
t.datetime "created_at"
t.datetime "updated_at"
Expand All @@ -301,45 +295,44 @@
end

create_table "posts", force: :cascade do |t|
t.integer "user_id", null: false
t.string "title"
t.integer "user_id", null: false
t.string "title", limit: 255
t.datetime "published_at"
t.datetime "expired_at"
t.datetime "deleted_at"
t.boolean "draft", default: true, null: false
t.integer "comment_count", default: 0, null: false
t.boolean "draft", default: true, null: false
t.integer "comment_count", default: 0, null: false
t.text "body"
t.datetime "created_at"
t.datetime "updated_at"
t.string "short_description"
t.integer "job_phase", null: false
t.integer "display", null: false
t.string "short_description", limit: 255
t.integer "job_phase", null: false
t.integer "display", null: false
t.text "notes"
t.string "copyright_owner"
t.string "seo_title"
t.string "seo_description"
t.string "seo_preview"
t.string "custom_author"
t.string "slug", null: false
t.string "copyright_owner", limit: 255
t.string "seo_title", limit: 255
t.string "seo_description", limit: 255
t.string "seo_preview", limit: 255
t.string "custom_author", limit: 255
t.string "slug", null: false
t.integer "featured_media_id"
t.integer "primary_industry_id"
t.integer "primary_category_id"
t.integer "tile_media_id"
t.hstore "meta"
t.string "type", default: "Post", null: false
t.string "type", default: "Post", null: false
t.integer "author_id"
t.boolean "is_wysiwyg", default: true
t.boolean "noindex", default: false
t.boolean "nofollow", default: false
t.boolean "nosnippet", default: false
t.boolean "noodp", default: false
t.boolean "noarchive", default: false
t.boolean "noimageindex", default: false
t.boolean "is_sticky", default: false
t.boolean "is_wysiwyg", default: true
t.boolean "noindex", default: false
t.boolean "nofollow", default: false
t.boolean "nosnippet", default: false
t.boolean "noodp", default: false
t.boolean "noarchive", default: false
t.boolean "noimageindex", default: false
t.boolean "is_sticky", default: false
t.index ["author_id"], name: "index_posts_on_author_id", using: :btree
t.index ["slug"], name: "index_posts_on_slug", using: :btree
t.index ["type"], name: "index_posts_on_type", using: :btree
t.index ["user_id"], name: "index_posts_on_user_id", using: :btree
end

create_table "role_permissions", force: :cascade do |t|
Expand All @@ -351,11 +344,10 @@

create_table "roles", force: :cascade do |t|
t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
t.string "resource_type"
t.integer "resource_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id", using: :btree
t.string "resource_id"
t.index ["name"], name: "index_roles_on_name", using: :btree
end

Expand All @@ -371,10 +363,10 @@

create_table "taggings", force: :cascade do |t|
t.integer "tag_id"
t.string "taggable_type"
t.integer "taggable_id"
t.string "tagger_type"
t.string "taggable_type", limit: 255
t.integer "tagger_id"
t.string "tagger_type", limit: 255
t.string "context", limit: 128
t.datetime "created_at"
t.index ["context"], name: "index_taggings_on_context", using: :btree
Expand All @@ -389,8 +381,9 @@
end

create_table "tags", force: :cascade do |t|
t.string "name"
t.integer "taggings_count", default: 0
t.string "name", limit: 255
t.integer "taggings_count", default: 0
t.integer "tenant_id", default: 1
t.index ["name"], name: "index_tags_on_name", unique: true, using: :btree
end

Expand All @@ -405,47 +398,43 @@
t.string "contact_email", limit: 200
t.string "contact_phone", limit: 20
t.datetime "deleted_at"
t.string "contract"
t.string "did"
t.string "contract", limit: 255
t.string "did", limit: 255
t.datetime "active_at"
t.datetime "deactive_at"
t.integer "owner_id"
t.datetime "created_at"
t.datetime "updated_at"
t.index ["did"], name: "index_tenants_on_did", using: :btree
t.index ["owner_id"], name: "index_tenants_on_owner_id", using: :btree
t.index ["parent_id"], name: "index_tenants_on_parent_id", using: :btree
end

create_table "users", force: :cascade do |t|
t.string "email", default: "", null: false
t.string "email", limit: 255, default: "", null: false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "tenant_id", null: false
t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"
t.integer "tenant_id", null: false
t.string "encrypted_password", limit: 255, default: "", null: false
t.string "reset_password_token", limit: 255
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.integer "sign_in_count", default: 0, null: false
t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.string "firstname", null: false
t.string "lastname"
t.string "locale", limit: 30, default: "en_US", null: false
t.string "timezone", limit: 30, default: "EST", null: false
t.boolean "admin", default: false, null: false
t.string "current_sign_in_ip", limit: 255
t.string "last_sign_in_ip", limit: 255
t.string "firstname", limit: 255, null: false
t.string "lastname", limit: 255
t.string "locale", limit: 30, default: "en_US", null: false
t.string "timezone", limit: 30, default: "EST", null: false
t.boolean "admin", default: false, null: false
t.index ["email"], name: "index_users_on_email", unique: true, using: :btree
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
t.index ["tenant_id"], name: "index_users_on_tenant_id", using: :btree
end

create_table "users_roles", id: false, force: :cascade do |t|
t.integer "user_id"
t.integer "role_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "user_id"
t.integer "role_id"
t.index ["user_id", "role_id"], name: "index_users_roles_on_user_id_and_role_id", using: :btree
end

Expand All @@ -468,6 +457,7 @@
t.boolean "noodp", default: false
t.boolean "noarchive", default: false
t.boolean "noimageindex", default: false
t.text "seo_keywords"
t.string "dynamic_yield_sku"
t.string "dynamic_yield_category"
t.jsonb "tables_widget"
Expand Down