diff --git a/apps/maarch_entreprise/actions/index_mlb.php b/apps/maarch_entreprise/actions/index_mlb.php index 2f1cf38f958d128bb78771e8ec633f3dcb0fb075..6fa661f973985539f3ca60122ea2077a3164e4ba 100644 --- a/apps/maarch_entreprise/actions/index_mlb.php +++ b/apps/maarch_entreprise/actions/index_mlb.php @@ -802,7 +802,7 @@ function get_form_txt($values, $pathManageAction, $actionId, $table, $module, $ $frmStr .= '</tr>'; /*** Status ***/ - if(count($statuses) > 0) { + if (count($statuses) > 0) { $frmStr .= '<tr id="status_tr" style="display:' . $displayValue . ';">'; $frmStr .= '<td><label for="status" class="form_title" >' . _STATUS . '</label></td>'; @@ -821,8 +821,9 @@ function get_form_txt($values, $pathManageAction, $actionId, $table, $module, $ $frmStr .= '</select></td><td><span class="red_asterisk" id="market_mandatory" ' . 'style="display:inline;"><i class="fa fa-star"></i></span> </td>'; $frmStr .= '</tr>'; - $frmStr .= '<script>$j("#status").chosen({width: "226px", disable_search_threshold: 10, search_contains: true});</script>'; - + + $frmStr .= '<script>$j("#status").chosen({width: "226px", disable_search_threshold: 10, search_contains: true});</script>'; + } $frmStr .= '</table>'; $frmStr .= '</div>'; diff --git a/apps/maarch_entreprise/actions/validate_mail.php b/apps/maarch_entreprise/actions/validate_mail.php index 25e27d9610587730acf10e199fd7c3f053a7e715..934f37474553457aa6f2f7c8de078b2a5156b8c6 100644 --- a/apps/maarch_entreprise/actions/validate_mail.php +++ b/apps/maarch_entreprise/actions/validate_mail.php @@ -858,15 +858,15 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module } } - if(count($statuses) > 0) { + if (count($statuses) > 0) { //load current status - $stmt = $db->query("SELECT status FROM " - . $view + $stmt = $db->query("SELECT status FROM " + . $view . " WHERE res_id = ?", array($res_id)); $statusObj = $stmt->fetchObject(); $current_status = $statusObj->status; if ($current_status <> '') { - $stmt = $db->query("SELECT label_status FROM " . STATUS_TABLE + $stmt = $db->query("SELECT label_status FROM " . STATUS_TABLE . " WHERE id = ?", array($current_status)); $statusObjLabel = $stmt->fetchObject(); $current_status_label = $statusObjLabel->label_status; @@ -879,7 +879,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module . 'id="status" onchange="clear_error(\'frm_error_' . $id_action . '\');">'; if ($current_status <> '') { - $frm_str .= '<option value="' . $current_status . '">' . _CHOOSE_CURRENT_STATUS + $frm_str .= '<option value="' . $current_status . '">' . _CHOOSE_CURRENT_STATUS . ' : ' . $current_status_label . '(' . $current_status . ')</option>'; } else { $frm_str .= '<option value="">' . _CHOOSE_CURRENT_STATUS . ')</option>'; @@ -895,8 +895,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module . 'style="display:inline;"><i class="fa fa-star"></i></span> </td>'; $frm_str .= '</tr>'; $frm_str .= '<script>$j("#status").chosen({width: "226px", disable_search_threshold: 10, search_contains: true});</script>'; - - + } $frm_str .= '</table>';