diff --git a/app/components/follow_button_component.rb b/app/components/follow_button_component.rb index f8f26c314..3dbf5cdcf 100644 --- a/app/components/follow_button_component.rb +++ b/app/components/follow_button_component.rb @@ -14,7 +14,7 @@ class FollowButtonComponent < ViewComponent::Base end def render? - Flipper.enabled? :multiuser + SiteSettings.multiuser_enabled? end erb_template <<-ERB diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb index c5a727166..1636d5078 100644 --- a/app/controllers/users/sessions_controller.rb +++ b/app/controllers/users/sessions_controller.rb @@ -36,7 +36,7 @@ class Users::SessionsController < Devise::SessionsController create_admin_user if User.with_role(:administrator).empty? # If in single user mode, or on first run, # automatically log in with an admin account - if !Flipper.enabled?(:multiuser) || User.with_role(:administrator).first.reset_password_token == "first_use" + if !SiteSettings.multiuser_enabled? || User.with_role(:administrator).first.reset_password_token == "first_use" sign_in(:user, User.with_role(:administrator).first) flash.discard redirect_back_or_to root_path, alert: nil diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb index 80afb1a2d..02fe753d4 100644 --- a/app/policies/application_policy.rb +++ b/app/policies/application_policy.rb @@ -36,7 +36,7 @@ class ApplicationPolicy all_of( user&.is_editor?, none_of( - Flipper.enabled?(:demo_mode) + SiteSettings.demo_mode_enabled? ) ) end diff --git a/app/policies/federails/following_policy.rb b/app/policies/federails/following_policy.rb index 64cd5e8ee..bb7eb4518 100644 --- a/app/policies/federails/following_policy.rb +++ b/app/policies/federails/following_policy.rb @@ -1,13 +1,13 @@ class Federails::FollowingPolicy < ApplicationPolicy def create? all_of( - Flipper.enabled?(:multiuser) + SiteSettings.multiuser_enabled? ) end def destroy? all_of( - Flipper.enabled?(:multiuser) + SiteSettings.multiuser_enabled? ) end diff --git a/app/policies/library_policy.rb b/app/policies/library_policy.rb index 73965e958..b7f2b1d49 100644 --- a/app/policies/library_policy.rb +++ b/app/policies/library_policy.rb @@ -3,7 +3,7 @@ class LibraryPolicy < ApplicationPolicy all_of( user&.is_administrator?, none_of( - Flipper.enabled?(:demo_mode) + SiteSettings.demo_mode_enabled? ) ) end diff --git a/app/policies/model_policy.rb b/app/policies/model_policy.rb index e51564f8f..ef96b7fc6 100644 --- a/app/policies/model_policy.rb +++ b/app/policies/model_policy.rb @@ -9,7 +9,7 @@ class ModelPolicy < ApplicationPolicy all_of( user&.is_editor?, none_of( - Flipper.enabled?(:demo_mode) + SiteSettings.demo_mode_enabled? ) ) end diff --git a/app/policies/upload_policy.rb b/app/policies/upload_policy.rb index 41d1fa429..6a91d56ca 100644 --- a/app/policies/upload_policy.rb +++ b/app/policies/upload_policy.rb @@ -7,7 +7,7 @@ class UploadPolicy < ApplicationPolicy all_of( user&.is_contributor?, none_of( - Flipper.enabled?(:demo_mode) + SiteSettings.demo_mode_enabled? ) ) end diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb index 3a278ce36..b7198b237 100644 --- a/app/policies/user_policy.rb +++ b/app/policies/user_policy.rb @@ -3,7 +3,7 @@ class UserPolicy < ApplicationPolicy all_of( user&.is_administrator?, none_of( - Flipper.enabled?(:demo_mode) + SiteSettings.demo_mode_enabled? ) ) end @@ -19,13 +19,13 @@ class UserPolicy < ApplicationPolicy def create? all_of( - Flipper.enabled?(:multiuser), + SiteSettings.multiuser_enabled?, one_of( - SiteSettings.registration_enabled, + SiteSettings.registration_enabled?, user&.is_administrator? ), none_of( - Flipper.enabled?(:demo_mode) + SiteSettings.demo_mode_enabled? ) ) end @@ -43,9 +43,9 @@ class UserPolicy < ApplicationPolicy user == record, user&.is_administrator? ), - Flipper.enabled?(:multiuser), + SiteSettings.multiuser_enabled?, none_of( - Flipper.enabled?(:demo_mode) + SiteSettings.demo_mode_enabled? ) ) end diff --git a/app/policies/users/passwords_policy.rb b/app/policies/users/passwords_policy.rb index 51cb9b29b..d2b1a4133 100644 --- a/app/policies/users/passwords_policy.rb +++ b/app/policies/users/passwords_policy.rb @@ -2,10 +2,10 @@ class Users::PasswordsPolicy < ApplicationPolicy def create? - Flipper.enabled?(:multiuser) && SiteSettings.email_configured + SiteSettings.multiuser_enabled? && SiteSettings.email_configured? end def update? - Flipper.enabled?(:multiuser) && SiteSettings.email_configured + SiteSettings.multiuser_enabled? && SiteSettings.email_configured? end end diff --git a/app/policies/users/registrations_policy.rb b/app/policies/users/registrations_policy.rb index 7b5f913dc..462556797 100644 --- a/app/policies/users/registrations_policy.rb +++ b/app/policies/users/registrations_policy.rb @@ -2,6 +2,6 @@ class Users::RegistrationsPolicy < ApplicationPolicy def cancel? - Flipper.enabled?(:multiuser) + SiteSettings.multiuser_enabled? end end diff --git a/app/policies/users/sessions_policy.rb b/app/policies/users/sessions_policy.rb index 586de5c8e..94d3f9ead 100644 --- a/app/policies/users/sessions_policy.rb +++ b/app/policies/users/sessions_policy.rb @@ -6,10 +6,10 @@ class Users::SessionsPolicy < ApplicationPolicy end def create? - Flipper.enabled?(:multiuser) + SiteSettings.multiuser_enabled? end def destroy? - Flipper.enabled?(:multiuser) + SiteSettings.multiuser_enabled? end end diff --git a/app/views/activity/index.html.erb b/app/views/activity/index.html.erb index dd8856d38..23e688588 100644 --- a/app/views/activity/index.html.erb +++ b/app/views/activity/index.html.erb @@ -4,7 +4,7 @@
<%= t "application.tagline" %>
- <% if Flipper.enabled? :demo_mode %> + <% if SiteSettings.demo_mode_enabled? %>- <%= Flipper.enabled?(:multiuser) ? t(".multiuser_mode") : t(".single_user_mode") %> + <%= SiteSettings.multiuser_enabled? ? t(".multiuser_mode") : t(".single_user_mode") %>
- <% if Flipper.enabled?(:multiuser) %> + <% if SiteSettings.multiuser_enabled? %>- <%= SiteSettings.registration_enabled ? t(".registrations_open") : t(".registrations_closed") %> + <%= SiteSettings.registration_enabled? ? t(".registrations_open") : t(".registrations_closed") %>
<% end %>diff --git a/app/views/settings/show.html.erb b/app/views/settings/show.html.erb index 76674284a..e1ba272c8 100644 --- a/app/views/settings/show.html.erb +++ b/app/views/settings/show.html.erb @@ -39,7 +39,7 @@