From 55d484c763e0539b990151b1b56aa10aa6405524 Mon Sep 17 00:00:00 2001 From: totoro Date: Sat, 7 Jan 2017 18:08:09 +0900 Subject: [PATCH] replace NULL value which are represented by "{NULL}" string by an empty string. This make better reading in view list or editor --- view/view_table_renderer.anubis | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/view/view_table_renderer.anubis b/view/view_table_renderer.anubis index 9389b59..ed2e331 100644 --- a/view/view_table_renderer.anubis +++ b/view/view_table_renderer.anubis @@ -13,7 +13,7 @@ read hayamiki_lib/types/hayamiki.anubis read system/string.anubis read locale/L3.anubis read tools/basis.anubis - +read data_base/sqlite.anubis read system_colors/rgb.anubis read system/convert.anubis @@ -68,9 +68,9 @@ public define List(CXM_Form_Field) primary_key(idx) then [hidden(html_Id(""), wan("id"), wav(idx))], information(s_name, c_name, value, width, help) then - [input_readonly(label(_T(s_name), no_help), wan(c_name), init(value), if width > 0 then custom(width) else narrow), help_line(help, _T)], + [input_readonly(label(_T(s_name), no_help), wan(c_name), init(not_null_String(value)), if width > 0 then custom(width) else narrow), help_line(help, _T)], text(s_name, c_name, value, help) then - [input(label(_T(s_name), no_help), wan(c_name), init(value), narrow, mandatory), help_line(help, _T)], + [input(label(_T(s_name), no_help), wan(c_name), init(not_null_String(value)), narrow, mandatory), help_line(help, _T)], password(s_name, c_name, help) then [password_input(label(_T(s_name), no_help), wan(c_name+"_1"), init(""), narrow, non_mandatory), password_input(label(_T(s_name), no_help), wan(c_name+"_2"), init(""), narrow, non_mandatory), @@ -81,7 +81,7 @@ public define List(CXM_Form_Field) choices_text(s_name, c_name, value, select, help) then [selector_c([],label(_T(s_name), no_help), html_Id(""), wan(c_name), 1, select.get(db), success(init(value)), mandatory), help_line(help, _T)], text_area(s_name, c_name, value, help) then - [text_area([],label(_T(s_name), no_help), html_Id(""), wan(c_name), init(value), narrow, (Int)5, mandatory), help_line(help, _T)], + [text_area([],label(_T(s_name), no_help), html_Id(""), wan(c_name), init(not_null_String(value)), narrow, (Int)5, mandatory), help_line(help, _T)], boolean(s_name, c_name, value, help) then [checkboxr([],label(_T(s_name), no_help), html_Id(""), wan(c_name), wav(c_name),value, mandatory), help_line(help, _T)], integer(s_name, c_name, value, help) then @@ -150,7 +150,7 @@ define HTML_Row(HTML_Off_Form) make_line [h . t] then with cell = if h is { - text(string) then cell((HTML_Off_Form)text(string)), + text(string) then cell((HTML_Off_Form)text(not_null_String(string))), // link(id, string) then cell((HTML_Off_Form)actioner(same,same, link(string), action_name, [("table_name", table_name),("id",id)])), link(id, string) then cell((HTML_Off_Form)literal(jq_dialog_open(string, dialog_id(action_name+"_dlg_ajax"), "'id="+id+"'"))), link_id_action(id, name, action) then cell((HTML_Off_Form)actioner(same,same, link(name), action, [("id",id)])), -- libgit2 0.21.4