David RENÉ / hayamiki_lib

Commit 924b60ab2de6c97fc38c4ed08bf7b2c839b3bbd7

Authored by totoro
1 parent c0af45f7

remove the dependency to web_site_directory

Showing 1 changed file with 27 additions and 29 deletions   Show diff stats
Inline Side-by-side
view/view_table_renderer.anubis
  Show/Hide comments   View file @924b60a
... ... @@ -463,7 +463,7 @@ public define HTML_Partial_Content
463 463 SQLite3DataBase db,
464 464 (String) -> String _T,
465 465 String lang,
466   - String web_site_directory,
  466 + //String web_site_directory,
467 467 String action_name,
468 468 VTM_view vtm_v,
469 469 String view_name,
... ... @@ -504,7 +504,7 @@ public define HTML_Partial_Content
504 504 SQLite3DataBase db,
505 505 (String) -> String _T,
506 506 String lang,
507   - String web_site_directory,
  507 + //String web_site_directory,
508 508 String action_name,
509 509 VTM_view vtm_v,
510 510 String view_name,
... ... @@ -536,7 +536,7 @@ public define Maybe(HTML_Partial_Content)
536 536 SQLite3DataBase db,
537 537 (String) -> String _T,
538 538 String lang,
539   - String web_site_directory,
  539 + //String web_site_directory,
540 540 String table_name,
541 541 String view_name,
542 542 String action_name,
... ... @@ -550,7 +550,7 @@ public define Maybe(HTML_Partial_Content)
550 550 {
551 551 failure then failure,
552 552 success(vtm_v) then
553   - success(view_table_page(db, _T, lang, web_site_directory, action_name, vtm_v, view_name, filter_name, f_clause, table_referer, fk_clause))
  553 + success(view_table_page(db, _T, lang, /*web_site_directory, */action_name, vtm_v, view_name, filter_name, f_clause, table_referer, fk_clause))
554 554 }.
555 555  
556 556 public define Maybe(HTML_Partial_Content)
... ... @@ -559,13 +559,13 @@ public define Maybe(HTML_Partial_Content)
559 559 SQLite3DataBase db,
560 560 (String) -> String _T,
561 561 String lang,
562   - String web_site_directory,
  562 + //String web_site_directory,
563 563 String table_name,
564 564 String view_name,
565 565 String action_name,
566 566 VTM vtm
567 567 ) =
568   - view_table_content(db, _T, lang, web_site_directory, table_name, view_name, action_name, "", "", no_referer, "", vtm).
  568 + view_table_content(db, _T, lang, /*web_site_directory,*/ table_name, view_name, action_name, "", "", no_referer, "", vtm).
569 569  
570 570 public define Maybe(HTML_Partial_Content)
571 571 table_in_list_view_only
... ... @@ -573,7 +573,7 @@ public define Maybe(HTML_Partial_Content)
573 573 SQLite3DataBase db,
574 574 (String) -> String _T,
575 575 String lang,
576   - String web_site_directory,
  576 + //String web_site_directory,
577 577 String table,
578 578 String view_name,
579 579 String filter_name,
... ... @@ -587,7 +587,7 @@ public define Maybe(HTML_Partial_Content)
587 587 {
588 588 failure then failure,
589 589 success(vtm_v) then
590   - 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))
  590 + 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))
591 591 }.
592 592  
593 593 define CXM_Form_Field
... ... @@ -712,11 +712,11 @@ public define List(CXM_Form_Field)
712 712 choices_int(s_name, c_name, value, select, help) then
713 713 [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)],
714 714 date(s_name, c_name, value, help) then
715   - [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)],
  715 + [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)],
716 716 time(s_name, c_name, value, help) then
717   - [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)],
  717 + [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)],
718 718 datetime(s_name, c_name, value, help) then
719   - [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)],
  719 + [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)],
720 720 color( s_name, c_name, value, help) then
721 721 [input([class("jscolor")], label(_T(s_name), no_help), wan(c_name), init(not_null_String(value)), narrow, mandatory), help_line(help, _T)],
722 722 phone( s_name, c_name, value, help) then
... ... @@ -736,16 +736,14 @@ public define HTML_Partial_Content
736 736 SQLite3DataBase db,
737 737 (String) -> String _T,
738 738 String lang,
739   - String web_site_directory,
  739 + //String web_site_directory,
740 740 String table_name,
741   - String view_name,
  741 + //String view_name,
742 742 List(HK_Form_Entry) list_entries,
743 743 List(HK_Form_Tab) list_tabs,
744 744 List(Web_arg) lwa,
745   - //String dialog_id,
746   - //HK_Form edit_form,
747 745 VTM vtm,
748   - String clause,
  746 + //String clause,
749 747 String fk_clause,
750 748 HK_Referer table_referer //from which table and row id that editor is called
751 749 ) =
... ... @@ -797,7 +795,7 @@ public define HTML_Partial_Content
797 795 |->
798 796 since tab is hk_form_tab(fk_table_name, fk_col_name, list_view_name),
799 797 with referer = hk_referer(table_name, id, fk_table_name, fk_col_name),
800   - if table_in_list_view_only(db, _T, lang, web_site_directory, fk_table_name, list_view_name, "", "edit", "", referer, fk_clause, vtm) is
  798 + if table_in_list_view_only(db, _T, lang, /* web_site_directory, */ fk_table_name, list_view_name, "", "edit", "", referer, fk_clause, vtm) is
801 799 {
802 800 failure then empty,
803 801 success(p_content) then partial(p_content)
... ... @@ -922,11 +920,11 @@ public define List(CXM_Form_Field)
922 920 choices_int(s_name, c_name, value, select, help) then
923 921 [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)],
924 922 date(s_name, c_name, value, help) then
925   - [input([class("datepicker")], no_label, html_Id(c_name), wan(c_name), init(value), small, non_mandatory), help_line(help, _T)],
  923 + [input([class("datepicker")], no_label, html_Id(c_name), wan(c_name), init(not_null_String(value)), small, non_mandatory), help_line(help, _T)],
926 924 time(s_name, c_name, value, help) then
927   - [input([class("timepicker")], no_label, html_Id(c_name), wan(c_name), init(value), small, non_mandatory), help_line(help, _T)],
  925 + [input([class("timepicker")], no_label, html_Id(c_name), wan(c_name), init(not_null_String(value)), small, non_mandatory), help_line(help, _T)],
928 926 datetime(s_name, c_name, value, help) then
929   - [input([class("datetimepicker")], no_label, html_Id(c_name), wan(c_name), init(value), custom(18), mandatory), help_line(help, _T)],
  927 + [input([class("datetimepicker")], no_label, html_Id(c_name), wan(c_name), init(not_null_String(value)), custom(18), mandatory), help_line(help, _T)],
930 928 color( s_name, c_name, value, help) then
931 929 [input([class("jscolor")], no_label, wan(c_name), init(not_null_String(value)), narrow, mandatory), help_line(help, _T)],
932 930 phone( s_name, c_name, value, help) then
... ... @@ -1000,13 +998,13 @@ public define HTML_Partial_Content
1000 998 SQLite3DataBase db,
1001 999 (String) -> String _T,
1002 1000 String lang,
1003   - String web_site_directory,
  1001 + //String web_site_directory,
1004 1002 String table_name,
1005   - String view_name,
  1003 + //String view_name,
1006 1004 HK_Form_Table table_form,
1007 1005 List(Web_arg) lwa,
1008 1006 VTM vtm,
1009   - String clause,
  1007 + //String clause,
1010 1008 String fk_clause,
1011 1009 HK_Referer table_referer //from which table and row id that editor is called
1012 1010 ) =
... ... @@ -1066,14 +1064,14 @@ public define Maybe(HTML_Partial_Content)
1066 1064 SQLite3DataBase db,
1067 1065 (String) -> String _T,
1068 1066 String lang,
1069   - String web_site_directory,
  1067 + //String web_site_directory,
1070 1068 List(Web_arg) lwa,
1071 1069 String dialog_id,
1072 1070 String table, //table name
1073 1071 String view_name, //view name to use
1074 1072 HK_Form_action action, //new_entry or edit an existing record
1075 1073 VTM vtm,
1076   - String clause,
  1074 + //String clause,
1077 1075 String fk_clause,
1078 1076 HK_Referer referer
1079 1077 ) =
... ... @@ -1085,9 +1083,9 @@ public define Maybe(HTML_Partial_Content)
1085 1083 if get_edit(db, action, view_name) is
1086 1084 {
1087 1085 hk_form_in_list(tb_name, v_name, list_form_entries, list_tabs) then
1088   - 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)),
  1086 + 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)),
1089 1087 hk_form_in_table(tb_name, v_name, form_in_table) then
1090   - success(renderer_edit_table_form(db, _T, lang, web_site_directory, tb_name, v_name, form_in_table, lwa, vtm, clause, fk_clause, referer))
  1088 + success(renderer_edit_table_form(db, _T, lang, /*web_site_directory,*/ tb_name, /*v_name,*/ form_in_table, lwa, vtm, /*clause,*/ fk_clause, referer))
1091 1089 }
1092 1090 }.
1093 1091  
... ... @@ -1097,7 +1095,7 @@ public define Maybe(HTML_Partial_Content)
1097 1095 SQLite3DataBase db,
1098 1096 (String) -> String _T,
1099 1097 String lang,
1100   - String web_site_directory,
  1098 + //String web_site_directory,
1101 1099 List(Web_arg) lwa,
1102 1100 String dialog_id,
1103 1101 String table, //table name
... ... @@ -1105,6 +1103,6 @@ public define Maybe(HTML_Partial_Content)
1105 1103 HK_Form_action action, //new_entry or edit an existing record
1106 1104 VTM vtm
1107 1105 ) =
1108   - edit_table_content(db, _T, lang, web_site_directory, lwa, dialog_id, table, view_name, action, vtm, "", "", no_referer)
  1106 + edit_table_content(db, _T, lang, /*web_site_directory,*/ lwa, dialog_id, table, view_name, action, vtm, "", /*"",*/ no_referer)
1109 1107 .
1110 1108  
... ...