mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-09 04:36:11 +10:00
Add dashboard attribute to User model
cherry-picked
This commit is contained in:
@@ -26,6 +26,7 @@ class Profiles::PreferencesController < Profiles::ApplicationController
|
||||
def preferences_params
|
||||
params.require(:user).permit(
|
||||
:color_scheme_id,
|
||||
:dashboard,
|
||||
:theme_id
|
||||
)
|
||||
end
|
||||
|
||||
+6
-1
@@ -50,12 +50,13 @@
|
||||
# bitbucket_access_token :string(255)
|
||||
# bitbucket_access_token_secret :string(255)
|
||||
# location :string(255)
|
||||
# public_email :string(255) default(""), not null
|
||||
# encrypted_otp_secret :string(255)
|
||||
# encrypted_otp_secret_iv :string(255)
|
||||
# encrypted_otp_secret_salt :string(255)
|
||||
# otp_required_for_login :boolean
|
||||
# otp_backup_codes :text
|
||||
# public_email :string(255) default(""), not null
|
||||
# dashboard :integer default(0)
|
||||
#
|
||||
|
||||
require 'carrierwave/orm/activerecord'
|
||||
@@ -701,4 +702,8 @@ class User < ActiveRecord::Base
|
||||
def can_be_removed?
|
||||
!solo_owned_groups.present?
|
||||
end
|
||||
|
||||
# User's Dashboard preference
|
||||
# Note: When adding an option, it MUST go on the end of the array.
|
||||
enum dashboard: [:projects, :stars]
|
||||
end
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
class AddDashboardToUsers < ActiveRecord::Migration
|
||||
def up
|
||||
add_column :users, :dashboard, :integer, default: 0
|
||||
end
|
||||
|
||||
def down
|
||||
remove_column :users, :dashboard
|
||||
end
|
||||
end
|
||||
+5
-3
@@ -11,7 +11,7 @@
|
||||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 20150529150354) do
|
||||
ActiveRecord::Schema.define(version: 20150610065936) do
|
||||
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
@@ -29,12 +29,13 @@ ActiveRecord::Schema.define(version: 20150529150354) do
|
||||
t.boolean "twitter_sharing_enabled", default: true
|
||||
t.text "restricted_visibility_levels"
|
||||
t.boolean "version_check_enabled", default: true
|
||||
t.integer "max_attachment_size", default: 10, null: false
|
||||
t.integer "max_attachment_size", default: 10, null: false
|
||||
t.integer "default_project_visibility"
|
||||
t.integer "default_snippet_visibility"
|
||||
t.text "restricted_signup_domains"
|
||||
t.boolean "user_oauth_applications", default: true
|
||||
t.string "after_sign_out_path"
|
||||
t.integer "session_expire_delay", default: 10080, null: false
|
||||
end
|
||||
|
||||
create_table "broadcast_messages", force: true do |t|
|
||||
@@ -495,12 +496,13 @@ ActiveRecord::Schema.define(version: 20150529150354) do
|
||||
t.string "bitbucket_access_token"
|
||||
t.string "bitbucket_access_token_secret"
|
||||
t.string "location"
|
||||
t.string "public_email", default: "", null: false
|
||||
t.string "encrypted_otp_secret"
|
||||
t.string "encrypted_otp_secret_iv"
|
||||
t.string "encrypted_otp_secret_salt"
|
||||
t.boolean "otp_required_for_login"
|
||||
t.text "otp_backup_codes"
|
||||
t.string "public_email", default: "", null: false
|
||||
t.integer "dashboard", default: 0
|
||||
end
|
||||
|
||||
add_index "users", ["admin"], name: "index_users_on_admin", using: :btree
|
||||
|
||||
@@ -25,6 +25,7 @@ describe Profiles::PreferencesController do
|
||||
def go(params: {}, format: :js)
|
||||
params.reverse_merge!(
|
||||
color_scheme_id: '1',
|
||||
dashboard: 'stars',
|
||||
theme_id: '1'
|
||||
)
|
||||
|
||||
@@ -40,6 +41,7 @@ describe Profiles::PreferencesController do
|
||||
it "changes the user's preferences" do
|
||||
prefs = {
|
||||
color_scheme_id: '1',
|
||||
dashboard: 'stars',
|
||||
theme_id: '2'
|
||||
}.with_indifferent_access
|
||||
|
||||
|
||||
@@ -50,12 +50,13 @@
|
||||
# bitbucket_access_token :string(255)
|
||||
# bitbucket_access_token_secret :string(255)
|
||||
# location :string(255)
|
||||
# public_email :string(255) default(""), not null
|
||||
# encrypted_otp_secret :string(255)
|
||||
# encrypted_otp_secret_iv :string(255)
|
||||
# encrypted_otp_secret_salt :string(255)
|
||||
# otp_required_for_login :boolean
|
||||
# otp_backup_codes :text
|
||||
# public_email :string(255) default(""), not null
|
||||
# dashboard :integer default(0)
|
||||
#
|
||||
|
||||
require 'spec_helper'
|
||||
|
||||
Reference in New Issue
Block a user