From a48e1ea83bf70ec3c05d59bd9fa6b132004ee2e7 Mon Sep 17 00:00:00 2001 From: totoro Date: Tue, 20 Mar 2018 14:35:54 +0100 Subject: [PATCH] add referer_row_id in web_arg add init_value in ajax combo init --- types/hayamiki.anubis | 3 ++- view/view_apps_renderer.anubis | 2 +- view/view_table_renderer.anubis | 27 ++++++++++++++++----------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/types/hayamiki.anubis b/types/hayamiki.anubis index 839c9f3..8128113 100644 --- a/types/hayamiki.anubis +++ b/types/hayamiki.anubis @@ -57,6 +57,7 @@ public define String __prefix__+"referer_table="+referer_table+"&"+ __prefix__+"referer_row_id="+referer_row_id+"&"+ __prefix__+"fk_table="+ fk_table+"&"+ - __prefix__+"fk_column="+ fk_column + __prefix__+"fk_column="+ fk_column+"&"+ + __prefix__+fk_column+"="+referer_row_id //add the column which reference the foreign_key and set the foreign id } . diff --git a/view/view_apps_renderer.anubis b/view/view_apps_renderer.anubis index 6dbe5b2..456d1ff 100644 --- a/view/view_apps_renderer.anubis +++ b/view/view_apps_renderer.anubis @@ -11,7 +11,7 @@ read hayamiki_lib/view/web_action.anubis read hayamiki_lib/controller/hk_sql_utils.anubis read calexium_lib/web/CXM_making_a_web_site.anubis -read calexium_lib/web/jQuery/CXM_jquery_dialog.anubis +read calexium_lib/web/jQuery/CXM_jquery_dialog.anubis read calexium_lib/web/jQuery/CXM_jquery_button.anubis read calexium_lib/web/jQuery/ui-addon/datetimepicker.anubis read calexium_lib/web/widgets/button.anubis diff --git a/view/view_table_renderer.anubis b/view/view_table_renderer.anubis index 2b1068c..932a9d9 100644 --- a/view/view_table_renderer.anubis +++ b/view/view_table_renderer.anubis @@ -132,14 +132,19 @@ public define HK_Filter define String ajax_combo_init_parameter ( - String combo_uid, - String f_table, //db table name - String c_name, //column name in the table - List(String) s_fields //search fields + String combo_uid, + String f_table, //db table name + String c_name, //column name in the table + Maybe(Int) init_value, // + List(String) s_fields //search fields )= "$('#"+combo_uid+"').ajaxComboBox( '?aws_controller=hk_c&aws_action=combo_search', - { - lang: 'fr', + {" ++ +if init_value is {failure then "", success(value) then +" init_record: "+value+",\n"} ++ +" lang: 'fr', per_page: 15, db_table: '"+f_table+"', button_img: 'ajax-combobox/btn.png', @@ -151,7 +156,7 @@ define String else " show_string: '"+join(", ", s_fields)+"',\n") + -" and_or: 'OR' +" and_or: 'OR'\n });" . @@ -526,10 +531,10 @@ public define HTML_Partial_Content //String web_site_directory, String action_name, VTM_view vtm_v, - String view_name, + String view_name, //requested view name String filter_name, String f_clause, //filter for current table - HK_Referer table_referer, + HK_Referer table_referer,//refer to caller table, useful for foreign key String fk_clause //filter for foreign key of the table (one to many) ) = with filter_clause = if f_clause = "" then "" else "&clause="+url_quote(f_clause), @@ -693,7 +698,7 @@ public define List(CXM_Form_Field) with uid = "_"+generate_random_string(20)+"_", //Get the priority of the web argument content for the select, this means the value already set by the user or called with programmaticaly with it with select = get_DB_id(lwa, c_name, _select), - with combo_init = ajax_combo_init_parameter(uid, foreign_table_name, c_name, s_fields), + with combo_init = ajax_combo_init_parameter(uid, foreign_table_name, c_name, to_mb_Int(select), s_fields), [ partial(partial_content([ js(js_file("ajax-combobox/js/jquery.ajax-combobox.js")), @@ -916,7 +921,7 @@ public define List(CXM_Form_Field) //[raw_in_form(literal(""))] with uid = "_"+generate_random_string(20)+"_", with select = get_DB_id(lwa, c_name, _select), - with combo_init = ajax_combo_init_parameter(uid, foreign_table_name, c_name, s_fields), + with combo_init = ajax_combo_init_parameter(uid, foreign_table_name, c_name, to_mb_Int(select), s_fields), [ partial(partial_content([ js(js_file("ajax-combobox/js/jquery.ajax-combobox.js")), -- libgit2 0.21.4