Commit 00507ef80e35a2cef4bcb91a760894c6eeab4ec0
1 parent
74e4ee86
replace the real password letter by the '*' in list view
improving the password management parsing in web arg
Showing
4 changed files
with
16 additions
and
8 deletions
Show diff stats
calexium_lib @ 3306145430a
densaku_lib @ e7fa05a251e
src/generation/html.anubis
| @@ -98,7 +98,9 @@ public define String | @@ -98,7 +98,9 @@ public define String | ||
| 98 | integer_field(choices) then to_HTML_cell_text(column, data_name, general_type_name), | 98 | integer_field(choices) then to_HTML_cell_text(column, data_name, general_type_name), |
| 99 | float_field then to_HTML_cell_text(column, data_name, general_type_name), | 99 | float_field then to_HTML_cell_text(column, data_name, general_type_name), |
| 100 | char_field(choices, size) then to_HTML_cell_text(column, data_name, general_type_name), | 100 | char_field(choices, size) then to_HTML_cell_text(column, data_name, general_type_name), |
| 101 | - password_field(min_size) then to_HTML_cell_text(column, data_name, general_type_name), | 101 | + password_field(min_size) then |
| 102 | + "text(\"********\")", | ||
| 103 | + //to_HTML_cell_text(column, data_name, general_type_name), | ||
| 102 | text_field(attrs) then to_HTML_cell_text(column, data_name, general_type_name), | 104 | text_field(attrs) then to_HTML_cell_text(column, data_name, general_type_name), |
| 103 | } | 105 | } |
| 104 | }. | 106 | }. |
src/generation/web_args.anubis
| @@ -121,15 +121,21 @@ public define String | @@ -121,15 +121,21 @@ public define String | ||
| 121 | else | 121 | else |
| 122 | "[]", | 122 | "[]", |
| 123 | foreign_key(_,_) then //"with "+name+" = get_DB_id(lwa, __prefix__+\""+name+"\"),", | 123 | foreign_key(_,_) then //"with "+name+" = get_DB_id(lwa, __prefix__+\""+name+"\"),", |
| 124 | - "with "+name+"_fk = get_DB_id(lwa, __prefix__+\""+name+"\"), [field(\""+name+"\", bind_DB_id_or_NULL(\":v_"+name+"\", "+name+"))]" | 124 | + "with "+name+" = get_DB_id(lwa, __prefix__+\""+name+"\"), [field(\""+name+"\", bind_DB_id_or_NULL(\":v_"+name+"\", "+name+"))]" |
| 125 | integer_field(_) then //"get_Int(lwa, __prefix__+\""+name+"\")", | 125 | integer_field(_) then //"get_Int(lwa, __prefix__+\""+name+"\")", |
| 126 | "if get_Int(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_Int(\":v_"+name+"\", "+name+"))] }" | 126 | "if get_Int(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_Int(\":v_"+name+"\", "+name+"))] }" |
| 127 | float_field then //"get_Float(lwa, __prefix__+\""+name+"\")", | 127 | float_field then //"get_Float(lwa, __prefix__+\""+name+"\")", |
| 128 | "if get_Float(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_Float(\":v_"+name+"\", "+name+"))] }" | 128 | "if get_Float(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_Float(\":v_"+name+"\", "+name+"))] }" |
| 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 | ||
| 132 | - "if get_Password(lwa, __prefix__+\""+name+"_1\", __prefix__+\""+name+"_2\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }" | 131 | + password_field(min_size) then |
| 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"+ | ||
| 134 | + " else\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"+ | ||
| 137 | + " else\n"+ | ||
| 138 | + " []" | ||
| 133 | // if get_Password(lwa, __prefix__+"password_1", __prefix__+"password_2") is {failure then [], success(password) then [field("passwxord", bind_String(":v_password", password))] } | 139 | // if get_Password(lwa, __prefix__+"password_1", __prefix__+"password_2") is {failure then [], success(password) then [field("passwxord", bind_String(":v_password", password))] } |
| 134 | text_field(_) then | 140 | text_field(_) then |
| 135 | "if get_String(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }" | 141 | "if get_String(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_String(\":v_"+name+"\", "+name+"))] }" |
| @@ -143,10 +149,10 @@ define String | @@ -143,10 +149,10 @@ define String | ||
| 143 | ( | 149 | ( |
| 144 | List(HK_Model_Column) columns, | 150 | List(HK_Model_Column) columns, |
| 145 | )= | 151 | )= |
| 146 | - join(" ,\n", | 152 | + join("+\n", |
| 147 | map((HK_Model_Column col) |-> | 153 | map((HK_Model_Column col) |-> |
| 148 | since col is hk_column(name, col_type, _, _), | 154 | since col is hk_column(name, col_type, _, _), |
| 149 | - from_web_arg_to_update_field(col_type, name), | 155 | + " "+from_web_arg_to_update_field(col_type, name), |
| 150 | columns | 156 | columns |
| 151 | ) | 157 | ) |
| 152 | ) | 158 | ) |