Commit 00507ef80e35a2cef4bcb91a760894c6eeab4ec0

Authored by totoro
1 parent 74e4ee86

replace the real password letter by the '*' in list view

improving the password management parsing in web arg
calexium_lib @ 3306145430a
1   -Subproject commit e8618692387dc76379b129c0b3de63c3083f0277
  1 +Subproject commit 3306145430afb6abfdae08e324b4002833eacd7e
... ...
densaku_lib @ e7fa05a251e
1   -Subproject commit 5c7cd864b6cc8232c2e719fe3a1e3740288cc0e2
  1 +Subproject commit e7fa05a251e0fe746b9524e94b42b5093c4714bf
... ...
src/generation/html.anubis
... ... @@ -98,7 +98,9 @@ public define String
98 98 integer_field(choices) then to_HTML_cell_text(column, data_name, general_type_name),
99 99 float_field then to_HTML_cell_text(column, data_name, general_type_name),
100 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 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 121 else
122 122 "[]",
123 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 125 integer_field(_) then //"get_Int(lwa, __prefix__+\""+name+"\")",
126 126 "if get_Int(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_Int(\":v_"+name+"\", "+name+"))] }"
127 127 float_field then //"get_Float(lwa, __prefix__+\""+name+"\")",
128 128 "if get_Float(lwa, __prefix__+\""+name+"\") is {failure then [], success("+name+") then [field(\""+name+"\", bind_Float(\":v_"+name+"\", "+name+"))] }"
129 129 char_field(_,_) then
130 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 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 140 text_field(_) then
135 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 149 (
144 150 List(HK_Model_Column) columns,
145 151 )=
146   - join(" ,\n",
  152 + join("+\n",
147 153 map((HK_Model_Column col) |->
148 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 156 columns
151 157 )
152 158 )
... ...