diff --git a/app/virtual_tables/app_config.php b/app/virtual_tables/app_config.php index 4ddc7e12e9..f4adcd11c2 100644 --- a/app/virtual_tables/app_config.php +++ b/app/virtual_tables/app_config.php @@ -289,6 +289,10 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ''; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = 'virtual_field_search_by'; + $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ''; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'virtual_field_column'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ''; @@ -305,12 +309,12 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ''; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'virtual_field_description'; - $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'virtual_field_desc'; + $apps[$x]['db'][$y]['fields'][$z]['name'] = 'virtual_field_value'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ''; $z++; - $apps[$x]['db'][$y]['fields'][$z]['name'] = 'virtual_field_value'; + $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'virtual_field_description'; + $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'virtual_field_desc'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ''; diff --git a/app/virtual_tables/virtual_table_fields.php b/app/virtual_tables/virtual_table_fields.php index c4d6f051fe..c62ebdc01a 100644 --- a/app/virtual_tables/virtual_table_fields.php +++ b/app/virtual_tables/virtual_table_fields.php @@ -86,6 +86,7 @@ $order = $_GET["order"]; echo th_order_by('virtual_field_column', 'Column', $order_by, $order); echo th_order_by('virtual_field_required', 'Required', $order_by, $order); echo th_order_by('virtual_field_list_hidden', 'Visible', $order_by, $order); + echo th_order_by('virtual_field_search_by', 'Search By', $order_by, $order); echo th_order_by('virtual_field_order', 'Field Order', $order_by, $order); echo th_order_by('virtual_field_order_tab', 'Tab Order', $order_by, $order); echo th_order_by('virtual_field_description', 'Description', $order_by, $order); @@ -105,6 +106,7 @@ $order = $_GET["order"]; echo " ".$row['virtual_field_column']."\n"; echo " ".$row['virtual_field_required']."\n"; echo " ".$row['virtual_field_list_hidden']."\n"; + echo " ".$row['virtual_field_search_by']."\n"; echo " ".$row['virtual_field_order']."\n"; echo " ".$row['virtual_field_order_tab']."\n"; echo " ".$row['virtual_field_description']." \n"; diff --git a/app/virtual_tables/virtual_table_fields_edit.php b/app/virtual_tables/virtual_table_fields_edit.php index d47aa00d8f..186e8f4246 100644 --- a/app/virtual_tables/virtual_table_fields_edit.php +++ b/app/virtual_tables/virtual_table_fields_edit.php @@ -55,6 +55,7 @@ if (count($_POST)>0) { $virtual_field_type = check_str($_POST["virtual_field_type"]); $virtual_field_value = check_str($_POST["virtual_field_value"]); $virtual_field_list_hidden = check_str($_POST["virtual_field_list_hidden"]); + $virtual_field_search_by = check_str($_POST["virtual_field_search_by"]); $virtual_field_column = check_str($_POST["virtual_field_column"]); $virtual_field_required = check_str($_POST["virtual_field_required"]); $virtual_field_order = check_str($_POST["virtual_field_order"]); @@ -76,6 +77,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if (strlen($virtual_field_type) == 0) { $msg .= "Please provide: Type
\n"; } //if (strlen($virtual_field_value) == 0) { $msg .= "Please provide: Value
\n"; } if (strlen($virtual_field_list_hidden) == 0) { $msg .= "Please provide: List Visibility
\n"; } + //if (strlen($virtual_field_search_by) == 0) { $msg .= "Please provide: Search By
\n"; } if (strlen($virtual_field_column) == 0) { $msg .= "Please provide: Column
\n"; } if (strlen($virtual_field_required) == 0) { $msg .= "Please provide: Required
\n"; } if (strlen($virtual_field_order) == 0) { $msg .= "Please provide: Field Order
\n"; } @@ -108,6 +110,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "virtual_field_type, "; $sql .= "virtual_field_value, "; $sql .= "virtual_field_list_hidden, "; + $sql .= "virtual_field_search_by, "; $sql .= "virtual_field_column, "; $sql .= "virtual_field_required, "; $sql .= "virtual_field_order, "; @@ -124,6 +127,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "'$virtual_field_type', "; $sql .= "'$virtual_field_value', "; $sql .= "'$virtual_field_list_hidden', "; + $sql .= "'$virtual_field_search_by', "; $sql .= "'$virtual_field_column', "; $sql .= "'$virtual_field_required', "; $sql .= "'$virtual_field_order', "; @@ -149,6 +153,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "virtual_field_type = '$virtual_field_type', "; $sql .= "virtual_field_value = '$virtual_field_value', "; $sql .= "virtual_field_list_hidden = '$virtual_field_list_hidden', "; + $sql .= "virtual_field_search_by = '$virtual_field_search_by', "; $sql .= "virtual_field_column = '$virtual_field_column', "; $sql .= "virtual_field_required = '$virtual_field_required', "; $sql .= "virtual_field_order = '$virtual_field_order', "; @@ -189,6 +194,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $virtual_field_type = $row["virtual_field_type"]; $virtual_field_value = $row["virtual_field_value"]; $virtual_field_list_hidden = $row["virtual_field_list_hidden"]; + $virtual_field_search_by = $row["virtual_field_search_by"]; $virtual_field_column = $row["virtual_field_column"]; $virtual_field_required = $row["virtual_field_required"]; $virtual_field_order = $row["virtual_field_order"]; @@ -454,6 +460,31 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo " Search By:\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo "Choose whether the field will be used for searches.\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo " Column:\n";