diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-05-30 14:30:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-30 14:30:38 +0300 |
| commit | 738ad9759ad1c38fb096d3fa567c48bd7a8f49e9 (patch) | |
| tree | c7de999fec9a1a2555b76faa1859a504e20a2b8d | |
| parent | dee4f1878ded9848a302f40a8d7523e32531e8c5 (diff) | |
Change default to single column UI (#10847)
Keep current setting for users who were active within the last month
| -rw-r--r-- | config/settings.yml | 2 | ||||
| -rw-r--r-- | db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb | 17 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
3 files changed, 19 insertions, 2 deletions
diff --git a/config/settings.yml b/config/settings.yml index 0c3510699..805624d3e 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -31,7 +31,7 @@ defaults: &defaults noindex: false theme: 'default' aggregate_reblogs: true - advanced_layout: true + advanced_layout: false notification_emails: follow: false reblog: false diff --git a/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb b/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb new file mode 100644 index 000000000..72b7c609d --- /dev/null +++ b/db/migrate/20190529143559_preserve_old_layout_for_existing_users.rb @@ -0,0 +1,17 @@ +class PreserveOldLayoutForExistingUsers < ActiveRecord::Migration[5.2] + disable_ddl_transaction! + + def up + # Assume that currently active users are already using the layout that they + # want to use, therefore ensure that it is saved explicitly and not based + # on the to-be-changed default + + User.where(User.arel_table[:current_sign_in_at].gteq(1.month.ago)).find_each do |user| + next if Setting.unscoped.where(thing_type: 'User', thing_id: user.id, var: 'advanced_layout').exists? + user.settings.advanced_layout = true + end + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index cff545be5..f633f4e3f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_05_19_130537) do +ActiveRecord::Schema.define(version: 2019_05_29_143559) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" |