From 924b60ab2de6c97fc38c4ed08bf7b2c839b3bbd7 Mon Sep 17 00:00:00 2001 From: totoro Date: Sun, 23 Jul 2017 22:59:18 +0200 Subject: [PATCH] remove the dependency to web_site_directory --- view/view_table_renderer.anubis | 56 +++++++++++++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/view/view_table_renderer.anubis b/view/view_table_renderer.anubis index 0bcc241..0e5c8ff 100644 --- a/view/view_table_renderer.anubis +++ b/view/view_table_renderer.anubis @@ -463,7 +463,7 @@ public define HTML_Partial_Content SQLite3DataBase db, (String) -> String _T, String lang, - String web_site_directory, + //String web_site_directory, String action_name, VTM_view vtm_v, String view_name, @@ -504,7 +504,7 @@ public define HTML_Partial_Content SQLite3DataBase db, (String) -> String _T, String lang, - String web_site_directory, + //String web_site_directory, String action_name, VTM_view vtm_v, String view_name, @@ -536,7 +536,7 @@ public define Maybe(HTML_Partial_Content) SQLite3DataBase db, (String) -> String _T, String lang, - String web_site_directory, + //String web_site_directory, String table_name, String view_name, String action_name, @@ -550,7 +550,7 @@ public define Maybe(HTML_Partial_Content) { failure then failure, success(vtm_v) then - success(view_table_page(db, _T, lang, web_site_directory, action_name, vtm_v, view_name, filter_name, f_clause, table_referer, fk_clause)) + success(view_table_page(db, _T, lang, /*web_site_directory, */action_name, vtm_v, view_name, filter_name, f_clause, table_referer, fk_clause)) }. public define Maybe(HTML_Partial_Content) @@ -559,13 +559,13 @@ public define Maybe(HTML_Partial_Content) SQLite3DataBase db, (String) -> String _T, String lang, - String web_site_directory, + //String web_site_directory, String table_name, String view_name, String action_name, VTM vtm ) = - view_table_content(db, _T, lang, web_site_directory, table_name, view_name, action_name, "", "", no_referer, "", vtm). + view_table_content(db, _T, lang, /*web_site_directory,*/ table_name, view_name, action_name, "", "", no_referer, "", vtm). public define Maybe(HTML_Partial_Content) table_in_list_view_only @@ -573,7 +573,7 @@ public define Maybe(HTML_Partial_Content) SQLite3DataBase db, (String) -> String _T, String lang, - String web_site_directory, + //String web_site_directory, String table, String view_name, String filter_name, @@ -587,7 +587,7 @@ public define Maybe(HTML_Partial_Content) { failure then failure, success(vtm_v) then - success(table_in_list_view(db, _T, lang, web_site_directory, action_name, vtm_v, view_name, filter_name, f_clause, table_referer, fk_filter)) + success(table_in_list_view(db, _T, lang, /*web_site_directory,*/ action_name, vtm_v, view_name, filter_name, f_clause, table_referer, fk_filter)) }. define CXM_Form_Field @@ -712,11 +712,11 @@ public define List(CXM_Form_Field) choices_int(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, no_referer, ""), success(init(to_String(value))), mandatory), help_line(help, _T)], date(s_name, c_name, value, help) then - [input([class("datepicker")], label(_T(s_name), no_help), html_Id(c_name), wan(c_name), init(value), small, non_mandatory), help_line(help, _T)], + [input([class("datepicker")], label(_T(s_name), no_help), html_Id(c_name), wan(c_name), init(not_null_String(value)), small, non_mandatory), help_line(help, _T)], time(s_name, c_name, value, help) then - [input([class("timepicker")], label(_T(s_name), no_help), html_Id(c_name), wan(c_name), init(value), small, non_mandatory), help_line(help, _T)], + [input([class("timepicker")], label(_T(s_name), no_help), html_Id(c_name), wan(c_name), init(not_null_String(value)), small, non_mandatory), help_line(help, _T)], datetime(s_name, c_name, value, help) then - [input([class("datetimepicker")], label(_T(s_name), no_help), html_Id(c_name), wan(c_name), init(value), custom(18), mandatory), help_line(help, _T)], + [input([class("datetimepicker")], label(_T(s_name), no_help), html_Id(c_name), wan(c_name), init(not_null_String(value)), custom(18), mandatory), help_line(help, _T)], color( s_name, c_name, value, help) then [input([class("jscolor")], label(_T(s_name), no_help), wan(c_name), init(not_null_String(value)), narrow, mandatory), help_line(help, _T)], phone( s_name, c_name, value, help) then @@ -736,16 +736,14 @@ public define HTML_Partial_Content SQLite3DataBase db, (String) -> String _T, String lang, - String web_site_directory, + //String web_site_directory, String table_name, - String view_name, + //String view_name, List(HK_Form_Entry) list_entries, List(HK_Form_Tab) list_tabs, List(Web_arg) lwa, - //String dialog_id, - //HK_Form edit_form, VTM vtm, - String clause, + //String clause, String fk_clause, HK_Referer table_referer //from which table and row id that editor is called ) = @@ -797,7 +795,7 @@ public define HTML_Partial_Content |-> since tab is hk_form_tab(fk_table_name, fk_col_name, list_view_name), with referer = hk_referer(table_name, id, fk_table_name, fk_col_name), - if table_in_list_view_only(db, _T, lang, web_site_directory, fk_table_name, list_view_name, "", "edit", "", referer, fk_clause, vtm) is + if table_in_list_view_only(db, _T, lang, /* web_site_directory, */ fk_table_name, list_view_name, "", "edit", "", referer, fk_clause, vtm) is { failure then empty, success(p_content) then partial(p_content) @@ -922,11 +920,11 @@ public define List(CXM_Form_Field) choices_int(s_name, c_name, value, select, help) then [selector_c([],no_label, html_Id(""), wan(c_name), 1, select.get(db, no_referer, ""), success(init(to_String(value))), mandatory), help_line(help, _T)], date(s_name, c_name, value, help) then - [input([class("datepicker")], no_label, html_Id(c_name), wan(c_name), init(value), small, non_mandatory), help_line(help, _T)], + [input([class("datepicker")], no_label, html_Id(c_name), wan(c_name), init(not_null_String(value)), small, non_mandatory), help_line(help, _T)], time(s_name, c_name, value, help) then - [input([class("timepicker")], no_label, html_Id(c_name), wan(c_name), init(value), small, non_mandatory), help_line(help, _T)], + [input([class("timepicker")], no_label, html_Id(c_name), wan(c_name), init(not_null_String(value)), small, non_mandatory), help_line(help, _T)], datetime(s_name, c_name, value, help) then - [input([class("datetimepicker")], no_label, html_Id(c_name), wan(c_name), init(value), custom(18), mandatory), help_line(help, _T)], + [input([class("datetimepicker")], no_label, html_Id(c_name), wan(c_name), init(not_null_String(value)), custom(18), mandatory), help_line(help, _T)], color( s_name, c_name, value, help) then [input([class("jscolor")], no_label, wan(c_name), init(not_null_String(value)), narrow, mandatory), help_line(help, _T)], phone( s_name, c_name, value, help) then @@ -1000,13 +998,13 @@ public define HTML_Partial_Content SQLite3DataBase db, (String) -> String _T, String lang, - String web_site_directory, + //String web_site_directory, String table_name, - String view_name, + //String view_name, HK_Form_Table table_form, List(Web_arg) lwa, VTM vtm, - String clause, + //String clause, String fk_clause, HK_Referer table_referer //from which table and row id that editor is called ) = @@ -1066,14 +1064,14 @@ public define Maybe(HTML_Partial_Content) SQLite3DataBase db, (String) -> String _T, String lang, - String web_site_directory, + //String web_site_directory, List(Web_arg) lwa, String dialog_id, String table, //table name String view_name, //view name to use HK_Form_action action, //new_entry or edit an existing record VTM vtm, - String clause, + //String clause, String fk_clause, HK_Referer referer ) = @@ -1085,9 +1083,9 @@ public define Maybe(HTML_Partial_Content) if get_edit(db, action, view_name) is { hk_form_in_list(tb_name, v_name, list_form_entries, list_tabs) then - success(renderer_edit_list_form(db, _T, lang, web_site_directory, tb_name, v_name, list_form_entries, list_tabs, lwa, vtm, clause, fk_clause, referer)), + success(renderer_edit_list_form(db, _T, lang, /*web_site_directory,*/ tb_name, /*v_name,*/ list_form_entries, list_tabs, lwa, vtm, /*clause,*/ fk_clause, referer)), hk_form_in_table(tb_name, v_name, form_in_table) then - success(renderer_edit_table_form(db, _T, lang, web_site_directory, tb_name, v_name, form_in_table, lwa, vtm, clause, fk_clause, referer)) + success(renderer_edit_table_form(db, _T, lang, /*web_site_directory,*/ tb_name, /*v_name,*/ form_in_table, lwa, vtm, /*clause,*/ fk_clause, referer)) } }. @@ -1097,7 +1095,7 @@ public define Maybe(HTML_Partial_Content) SQLite3DataBase db, (String) -> String _T, String lang, - String web_site_directory, + //String web_site_directory, List(Web_arg) lwa, String dialog_id, String table, //table name @@ -1105,6 +1103,6 @@ public define Maybe(HTML_Partial_Content) HK_Form_action action, //new_entry or edit an existing record VTM vtm ) = - edit_table_content(db, _T, lang, web_site_directory, lwa, dialog_id, table, view_name, action, vtm, "", "", no_referer) + edit_table_content(db, _T, lang, /*web_site_directory,*/ lwa, dialog_id, table, view_name, action, vtm, "", /*"",*/ no_referer) . -- libgit2 0.21.4