diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-10-13 01:09:02 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-10-13 01:09:02 +0000 |
| commit | 7c96ee7815c216d6ac3b748d7dd6959376d3914e (patch) | |
| tree | fd36bade02afa1536198e7f3beafb208973b68c5 /app/controllers/admin | |
| parent | f9275cb762a311cbf298b3929552a153703c0726 (diff) | |
| parent | 70d346ea951ebfa002225759310d72882a435a5c (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/accounts_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/admin/settings_controller.rb | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index e7ca6b907..5d57fe361 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -95,7 +95,7 @@ module Admin :remote, :by_domain, :silenced, - :recent, + :alphabetic, :suspended, :username, :display_name, diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index c05c4c841..fe2720c48 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -18,8 +18,10 @@ module Admin bootstrap_timeline_accounts flavour skin + flavour_and_skin thumbnail hero + mascot min_invite_role activity_api_enabled peers_api_enabled @@ -42,6 +44,7 @@ module Admin UPLOAD_SETTINGS = %w( thumbnail hero + mascot ).freeze def edit @@ -52,7 +55,13 @@ module Admin def update authorize :settings, :update? - settings_params.each do |key, value| + settings = settings_params + flavours_and_skin = settings.delete('flavour_and_skin') + if flavours_and_skin + settings['flavour'], settings['skin'] = flavours_and_skin.split('/', 2) + end + + settings.each do |key, value| if UPLOAD_SETTINGS.include?(key) upload = SiteUpload.where(var: key).first_or_initialize(var: key) upload.update(file: value) |