Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
26
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'fix-admin-settings' into 'master'

Browse Source 
Fix admin settings

See merge request framasoft/mobilizon!457
This commit is contained in:
Thomas Citharel 2020-06-09 17:59:24 +02:00
commit 55e22acbfc
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/views/Admin/Settings.vue
View File

@ -105,7 +105,7 @@
<script lang="ts"> <script lang="ts">
import { Component, Vue } from "vue-property-decorator"; import { Component, Vue } from "vue-property-decorator";
import { ADMIN_SETTINGS, SAVE_ADMIN_SETTINGS } from "@/graphql/admin"; import { ADMIN_SETTINGS, SAVE_ADMIN_SETTINGS } from "@/graphql/admin";
import { IAdminSettings, InstanceTermsType } from "@/types/admin.model"; import { IAdminSettings, InstanceTermsType } from "../../types/admin.model";
import RouteName from "../../router/name"; import RouteName from "../../router/name";
@Component({ @Component({

10
lib/graphql/resolvers/admin.ex
View File

@ -157,7 +157,15 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
when is_admin(role) do when is_admin(role) do
with {:ok, res} <- Admin.save_settings("instance", args) do with {:ok, res} <- Admin.save_settings("instance", args) do
res = res =
res |> Enum.map(fn {key, %Setting{value: value}} -> {key, value} end) |> Enum.into(%{}) res
|> Enum.map(fn {key, %Setting{value: value}} ->
case value do
"true" -> {key, true}
"false" -> {key, false}
value -> {key, value}
end
end)
|> Enum.into(%{})
Config.clear_config_cache() Config.clear_config_cache()