Skip to content

Legacy Users Being Directed to New Interface #278

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
toastercup merged 1 commit into from
Jun 17, 2016
Merged

Legacy Users Being Directed to New Interface #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions app/controllers/authentication/sessions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
class Authentication::SessionsController < Devise::SessionsController
def after_sign_in_path_for(resource)
if params[:legacy] == '1'
session[:legacy] = true
legacy_root_path
else
session[:legacy] = false
root_path
end
end
Expand Down
1 change: 1 addition & 0 deletions app/controllers/dashboards_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ class DashboardsController < AdminController
add_breadcrumb 'Dashboard', :dashboards_path

def index
redirect_to legacy_root_path if session[:legacy]
end
end
2 changes: 1 addition & 1 deletion app/views/layouts/devise.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
.mdl-cell.mdl-cell--1-col.mdl-cell--hide-tablet.mdl-cell--hide-phone
.mdl-color--white.mdl-shadow--4dp.content.mdl-color-text--grey-800.mdl-cell.mdl-cell--10-col
= yield
= javascript_include_tag :authentication
= javascript_include_tag :authentication
158 changes: 84 additions & 74 deletions db/schema.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@
enable_extension "uuid-ossp"

create_table "applications", force: :cascade do |t|
t.string "name", limit: 255
t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
t.boolean "write", default: false
t.boolean "write", default: false
t.integer "tenant_id"
end

add_index "applications", ["tenant_id"], name: "index_applications_on_tenant_id", using: :btree

create_table "authors", force: :cascade do |t|
t.string "firstname", limit: 255
t.string "lastname", limit: 255
t.string "email", limit: 255
t.string "firstname"
t.string "lastname"
t.string "email"
t.hstore "sites"
t.string "title", limit: 255
t.string "title"
t.text "bio"
t.integer "user_id"
end
Expand Down Expand Up @@ -62,8 +62,8 @@
add_index "bulk_jobs", ["user_id"], name: "index_bulk_jobs_on_user_id", using: :btree

create_table "categories", force: :cascade do |t|
t.string "name", limit: 255
t.integer "user_id", null: false
t.string "name"
t.integer "user_id", null: false
t.integer "parent_id"
t.integer "lft"
t.integer "rgt"
Expand All @@ -72,6 +72,12 @@
t.datetime "updated_at"
end

add_index "categories", ["depth"], name: "index_categories_on_depth", using: :btree
add_index "categories", ["lft"], name: "index_categories_on_lft", using: :btree
add_index "categories", ["parent_id"], name: "index_categories_on_parent_id", using: :btree
add_index "categories", ["rgt"], name: "index_categories_on_rgt", using: :btree
add_index "categories", ["user_id"], name: "index_categories_on_user_id", using: :btree

create_table "categories_posts", id: false, force: :cascade do |t|
t.integer "post_id", null: false
t.integer "category_id", null: false
Expand Down Expand Up @@ -141,7 +147,7 @@
add_index "fields", ["deleted_at"], name: "index_fields_on_deleted_at", using: :btree

create_table "locales", id: :uuid, default: "uuid_generate_v4()", force: :cascade do |t|
t.string "name", limit: 255, null: false
t.string "name", null: false
t.integer "localization_id"
t.integer "user_id"
t.datetime "created_at"
Expand All @@ -164,25 +170,26 @@
add_index "localizations", ["user_id"], name: "index_localizations_on_user_id", using: :btree

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

add_index "media", ["name"], name: "index_media_on_name", using: :btree
add_index "media", ["user_id"], name: "index_media_on_user_id", using: :btree

create_table "media_posts", id: false, force: :cascade do |t|
Expand All @@ -191,51 +198,51 @@
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", limit: 255, 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", 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", limit: 255
t.string "scopes"
end

add_index "oauth_access_grants", ["token"], name: "index_oauth_access_grants_on_token", unique: true, using: :btree

create_table "oauth_access_tokens", force: :cascade do |t|
t.integer "resource_owner_id"
t.integer "application_id"
t.string "token", limit: 255, null: false
t.string "refresh_token", limit: 255
t.string "token", null: false
t.string "refresh_token"
t.integer "expires_in"
t.datetime "revoked_at"
t.datetime "created_at", null: false
t.string "scopes", limit: 255
t.datetime "created_at", null: false
t.string "scopes"
end

add_index "oauth_access_tokens", ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true, using: :btree
add_index "oauth_access_tokens", ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id", using: :btree
add_index "oauth_access_tokens", ["token"], name: "index_oauth_access_tokens_on_token", unique: true, using: :btree

create_table "oauth_applications", force: :cascade do |t|
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.string "name", null: false
t.string "uid", null: false
t.string "secret", null: false
t.text "redirect_uri", null: false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "owner_id"
t.string "owner_type", limit: 255
t.string "scopes", default: "", null: false
t.string "owner_type"
t.string "scopes", default: "", null: false
end

add_index "oauth_applications", ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type", using: :btree
add_index "oauth_applications", ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree

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

create_table "posts", force: :cascade do |t|
t.integer "user_id", null: false
t.string "title", limit: 255
t.integer "user_id", null: false
t.string "title"
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", limit: 255
t.integer "job_phase", null: false
t.integer "display", null: false
t.string "short_description"
t.integer "job_phase", null: false
t.integer "display", null: false
t.text "notes"
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", limit: 255, null: false
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.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", limit: 255, 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_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
end

add_index "posts", ["author_id"], name: "index_posts_on_author_id", using: :btree
add_index "posts", ["slug"], name: "index_posts_on_slug", unique: true, using: :btree
add_index "posts", ["type"], name: "index_posts_on_type", using: :btree
add_index "posts", ["user_id"], name: "index_posts_on_user_id", using: :btree

create_table "snippets", force: :cascade do |t|
t.integer "webpage_id", null: false
Expand All @@ -301,9 +309,9 @@
create_table "taggings", force: :cascade do |t|
t.integer "tag_id"
t.integer "taggable_id"
t.string "taggable_type", limit: 255
t.string "taggable_type"
t.integer "tagger_id"
t.string "tagger_type", limit: 255
t.string "tagger_type"
t.string "context", limit: 128
t.datetime "created_at"
end
Expand All @@ -312,8 +320,8 @@
add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree

create_table "tags", force: :cascade do |t|
t.string "name", limit: 255
t.integer "taggings_count", default: 0
t.string "name"
t.integer "taggings_count", default: 0
end

add_index "tags", ["name"], name: "index_tags_on_name", unique: true, using: :btree
Expand All @@ -329,36 +337,38 @@
t.string "contact_email", limit: 200
t.string "contact_phone", limit: 20
t.datetime "deleted_at"
t.string "contract", limit: 255
t.string "did", limit: 255
t.string "contract"
t.string "did"
t.datetime "active_at"
t.datetime "deactive_at"
t.integer "owner_id"
t.datetime "created_at"
t.datetime "updated_at"
end

add_index "tenants", ["did"], name: "index_tenants_on_did", using: :btree
add_index "tenants", ["owner_id"], name: "index_tenants_on_owner_id", using: :btree
add_index "tenants", ["parent_id"], name: "index_tenants_on_parent_id", using: :btree

create_table "users", force: :cascade do |t|
t.string "email", limit: 255, default: "", null: false
t.string "email", default: "", null: false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "tenant_id", null: false
t.string "encrypted_password", limit: 255, default: "", null: false
t.string "reset_password_token", limit: 255
t.integer "tenant_id", null: false
t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"
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", 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.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
end

add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
Expand Down