Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2025-05-25 14:51:59 +02:00
parent f622686397 f1a6f4333a
commit b031f65670
148 changed files with 1524 additions and 1211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/controllers/admin/rules_controller.rb
View File

@@ -7,7 +7,7 @@ module Admin
def index
authorize :rule, :index?
@rules = Rule.ordered
@rules = Rule.ordered.includes(:translations)
end
def new
@@ -27,7 +27,6 @@ module Admin
if @rule.save
redirect_to admin_rules_path
else
@rules = Rule.ordered
render :new
end
end
@@ -50,6 +49,22 @@ module Admin
redirect_to admin_rules_path
end
def move_up
authorize @rule, :update?
@rule.move!(-1)
redirect_to admin_rules_path
end
def move_down
authorize @rule, :update?
@rule.move!(+1)
redirect_to admin_rules_path
end
private
def set_rule
@@ -58,7 +73,7 @@ module Admin
def resource_params
params
.expect(rule: [:text, :hint, :priority])
.expect(rule: [:text, :hint, :priority, translations_attributes: [[:id, :language, :text, :hint, :_destroy]]])
end
end
end