From 939b0056f07703ed5234ea6f353a4bd1c6e60205 Mon Sep 17 00:00:00 2001 From: totoro Date: Sun, 26 Mar 2017 20:14:28 +0200 Subject: [PATCH] in to_VT_view_model, remove extra argument generated in choices_text in from_web_arg_to_update_field surround the password management with ( ) to avoid the '+' (plus sign) to concatenate the others web arg extractor with the last else of password extraction management --- src/generation/vt_view.anubis | 2 +- src/generation/web_args.anubis | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/generation/vt_view.anubis b/src/generation/vt_view.anubis index bc90cdc..07111f7 100644 --- a/src/generation/vt_view.anubis +++ b/src/generation/vt_view.anubis @@ -70,7 +70,7 @@ define String text_choices(choices_list) then //if choice list is NOT empty we construct the possible choices selector if length(choices_list) > 0 then - "choices_text(\""+to_upper(name)+"\", \""+name+"\", "+type_name+"."+name+", vt_edit_selector(get_choices_selector_"+to_lower(type_name)+"_"+name+"), "+to_Anubis_source(help)+")" + "choices_text(\""+to_upper(name)+"\", \""+name+"\", vt_edit_selector(get_choices_selector_"+to_lower(type_name)+"_"+name+"), "+to_Anubis_source(help)+")" else "text(\""+to_upper(name)+"\", \""+name+"\", "+to_Anubis_source(help)+")" } diff --git a/src/generation/web_args.anubis b/src/generation/web_args.anubis index c926b2f..e3d37c4 100644 --- a/src/generation/web_args.anubis +++ b/src/generation/web_args.anubis @@ -129,13 +129,14 @@ public define String char_field(_,_) then "if get_String(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }", password_field(min_size) then - "if get_String(lwa, \"password_pwd_change_option\", \"false\") = \"false\" then \n"+ + "(if get_String(lwa, \"password_pwd_change_option\", \"false\") = \"false\" then \n"+ " if get_Password(lwa, __prefix__+\""+name+"_1\", __prefix__+\""+name+"_2\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }\n"+ " else\n"+ " if get_Bool(lwa, __prefix__+\""+name+"_pwd_change\") then \n"+ " if get_Password(lwa, __prefix__+\""+name+"_1\", __prefix__+\""+name+"_2\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }\n"+ " else\n"+ - " []" + " []\n"+ + " )" // if get_Password(lwa, __prefix__+"password_1", __prefix__+"password_2") is {failure then [], success(password) then [field("passwxord", bind_String(":v_password", password))] } text_field(_) then "if get_String(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }" -- libgit2 0.21.4