Skip to content

Commit 86e9e54

Browse files
authored
Merge pull request #96 from geneanet/gnt-search-get-config
allow translations request when not a wizard
2 parents 49e139a + adafbb5 commit 86e9e54

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

src/api_saisie_write.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ let print_config conf =
461461
let transl_hebrew_month = Api_saisie_write_piqi.Config_transl_hebrew_month.({msg = transl_hebrew_month;}) in
462462
let (gwf_place_format, gwf_place_format_placeholder) =
463463
match List.assoc_opt "places_format" conf.Geneweb.Config.base_env with
464-
| Some s ->
464+
| Some s when conf.Geneweb.Config.wizard ->
465465
let placeholder =
466466
(try
467467
List.fold_right
@@ -486,7 +486,7 @@ let print_config conf =
486486
| _ -> placeholder
487487
in
488488
(s, placeholder)
489-
| None -> ("", "")
489+
| Some _ | None -> ("", "")
490490
in
491491
let config =
492492
Api_saisie_write_piqi.Config.({

src/plugin_api.ml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ let friend fn conf base =
33
then fn conf base
44
else Gwd_lib.Request.incorrect_request conf
55

6-
let wiz' fn conf =
7-
if conf.Geneweb.Config.wizard then
8-
fn conf
9-
else if conf.Geneweb.Config.just_friend_wizard then
10-
Plugin_api_lib.Api_util.print_error conf `forbidden ""
11-
else
12-
(* FIXME: Needs auth headers *)
13-
Plugin_api_lib.Api_util.print_error conf `unauthorized ""
14-
156
let wiz fn conf base =
167
if conf.Geneweb.Config.wizard then
178
fn conf base
@@ -158,7 +149,7 @@ let () =
158149
; ( "API_AUTO_COMPLETE"
159150
, fun a -> aux (wiz @@ w_base @@ Plugin_api_lib.Api_saisie_write.print_auto_complete a) a)
160151
; ( "API_GET_CONFIG"
161-
, aux @@ fun conf _ -> wiz' Plugin_api_lib.Api_saisie_write.print_config conf)
152+
, aux @@ fun conf _ -> Plugin_api_lib.Api_saisie_write.print_config conf)
162153
; ( "API_PERSON_SEARCH_LIST"
163154
, aux @@ w_base @@ Plugin_api_lib.Api_saisie_write.print_person_search_list)
164155
; ( "API_GET_PERSON_SEARCH_INFO"

0 commit comments

Comments
 (0)