gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 17

Merge remote-tracking branch 'origin/kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-04-06 16:57:01 +09:00
commit 94cd200097
50 changed files with 801 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/application_helper.rb
View file

@ -202,9 +202,13 @@ module ApplicationHelper
}
permit_visibilities = %w(public unlisted public_unlisted private direct)
permit_searchabilities = %w(public unlisted public_unlisted private direct)
default_privacy = current_account&.user&.setting_default_privacy
permit_visibilities.shift(permit_visibilities.index(default_privacy) + 1) if default_privacy.present?
state_params[:visibility] = params[:visibility] if permit_visibilities.include? params[:visibility]
default_searchability = current_account&.user&.setting_default_searchability
permit_searchabilities.shift(permit_searchabilities.index(default_privacy) + 1) if default_searchability.present?
state_params[:searchability] = params[:searchability] if permit_searchabilities.include? params[:searchability]
if user_signed_in? && current_user.functional?
state_params[:settings] = state_params[:settings].merge(Web::Setting.find_by(user: current_user)&.data || {})