David RENÉ / hayamiki

Commit 939b0056f07703ed5234ea6f353a4bd1c6e60205

Authored by totoro
1 parent 936e54ed

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
Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
Inline Side-by-side
src/generation/vt_view.anubis
  Show/Hide comments   View file @939b005
@@ -70,7 +70,7 @@ define String @@ -70,7 +70,7 @@ define String
70 text_choices(choices_list) then 70 text_choices(choices_list) then
71 //if choice list is NOT empty we construct the possible choices selector 71 //if choice list is NOT empty we construct the possible choices selector
72 if length(choices_list) > 0 then 72 if length(choices_list) > 0 then
73 - "choices_text(\""+to_upper(name)+"\", \""+name+"\", "+type_name+"."+name+", vt_edit_selector(get_choices_selector_"+to_lower(type_name)+"_"+name+"), "+to_Anubis_source(help)+")" 73 + "choices_text(\""+to_upper(name)+"\", \""+name+"\", vt_edit_selector(get_choices_selector_"+to_lower(type_name)+"_"+name+"), "+to_Anubis_source(help)+")"
74 else 74 else
75 "text(\""+to_upper(name)+"\", \""+name+"\", "+to_Anubis_source(help)+")" 75 "text(\""+to_upper(name)+"\", \""+name+"\", "+to_Anubis_source(help)+")"
76 } 76 }
src/generation/web_args.anubis
  Show/Hide comments   View file @939b005
@@ -129,13 +129,14 @@ public define String @@ -129,13 +129,14 @@ public define String
129 char_field(_,_) then 129 char_field(_,_) then
130 "if get_String(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }", 130 "if get_String(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }",
131 password_field(min_size) then 131 password_field(min_size) then
132 - "if get_String(lwa, \"password_pwd_change_option\", \"false\") = \"false\" then \n"+ 132 + "(if get_String(lwa, \"password_pwd_change_option\", \"false\") = \"false\" then \n"+
133 " if get_Password(lwa, __prefix__+\""+name+"_1\", __prefix__+\""+name+"_2\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }\n"+ 133 " if get_Password(lwa, __prefix__+\""+name+"_1\", __prefix__+\""+name+"_2\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }\n"+
134 " else\n"+ 134 " else\n"+
135 " if get_Bool(lwa, __prefix__+\""+name+"_pwd_change\") then \n"+ 135 " if get_Bool(lwa, __prefix__+\""+name+"_pwd_change\") then \n"+
136 " if get_Password(lwa, __prefix__+\""+name+"_1\", __prefix__+\""+name+"_2\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }\n"+ 136 " if get_Password(lwa, __prefix__+\""+name+"_1\", __prefix__+\""+name+"_2\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }\n"+
137 " else\n"+ 137 " else\n"+
138 - " []" 138 + " []\n"+
  139 + " )"
139 // if get_Password(lwa, __prefix__+"password_1", __prefix__+"password_2") is {failure then [], success(password) then [field("passwxord", bind_String(":v_password", password))] } 140 // if get_Password(lwa, __prefix__+"password_1", __prefix__+"password_2") is {failure then [], success(password) then [field("passwxord", bind_String(":v_password", password))] }
140 text_field(_) then 141 text_field(_) then
141 "if get_String(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }" 142 "if get_String(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }"