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

Merge remote-tracking branch 'parent/main' into upstream-20240422

Browse source
This commit is contained in:
KMY 2024-04-22 08:58:37 +09:00
commit 44f4a93430
100 changed files with 770 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/settings/featured_tags_controller.rb
View file

@ -38,7 +38,7 @@ class Settings::FeaturedTagsController < Settings::BaseController
end
def set_recently_used_tags
@recently_used_tags = Tag.recently_used(current_account).where.not(id: @featured_tags.map(&:id)).limit(10)
@recently_used_tags = Tag.suggestions_for_account(current_account).limit(10)
end
def featured_tag_params

4
app/controllers/settings/imports_controller.rb
View file

@ -31,7 +31,7 @@ class Settings::ImportsController < Settings::BaseController
def show; end
def failures
@bulk_import = current_account.bulk_imports.where(state: :finished).find(params[:id])
@bulk_import = current_account.bulk_imports.state_finished.find(params[:id])
respond_to do |format|
format.csv do
@ -92,7 +92,7 @@ class Settings::ImportsController < Settings::BaseController
end
def set_bulk_import
@bulk_import = current_account.bulk_imports.where(state: :unconfirmed).find(params[:id])
@bulk_import = current_account.bulk_imports.state_unconfirmed.find(params[:id])
end
def set_recent_imports