From a7f95e99dba2b7d4c1e82e10e157a0a7ed6b5964 Mon Sep 17 00:00:00 2001
From: herzouzou <henri.queneau@maarch.org>
Date: Thu, 16 Mar 2017 18:19:31 +0100
Subject: [PATCH] FIX #5317 enabled to add a note when you confirm from
indexingbasket
---
.../actions/confirm_status.php | 28 ++++++++++---------
.../change_category_actions.php | 7 +++--
core/manage_action.php | 2 +-
3 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/apps/maarch_entreprise/actions/confirm_status.php b/apps/maarch_entreprise/actions/confirm_status.php
index f1df4d3c68f..c115daf4692 100755
--- a/apps/maarch_entreprise/actions/confirm_status.php
+++ b/apps/maarch_entreprise/actions/confirm_status.php
@@ -75,24 +75,26 @@ $frm_height = 'auto';
$templates = $templatesControler->getAllTemplatesForSelect();
}
$frm_str .='<center style="font-size:15px;">'._ACTION_CONFIRM.'<br/><br/><b>'.$labelAction.' ?</b></center><br/>';
- $frm_str .='<b>'._PROCESS_NOTES.':</b><br/>';
- $frm_str .= '<select name="templateNotes" id="templateNotes" style="width:98%;margin-bottom: 10px;background-color: White;border: 1px solid #999;color: #666;text-align: left;" '
+ if($_SESSION['current_basket']['id'] != 'IndexingBasket'){
+ $frm_str .='<b>'._PROCESS_NOTES.':</b><br/>';
+ $frm_str .= '<select name="templateNotes" id="templateNotes" style="width:98%;margin-bottom: 10px;background-color: White;border: 1px solid #999;color: #666;text-align: left;" '
. 'onchange="addTemplateToNote($(\'templateNotes\').value, \''
. $_SESSION['config']['businessappurl'] . 'index.php?display=true'
. '&module=templates&page=templates_ajax_content_for_notes\');document.getElementById(\'notes\').focus();">';
- $frm_str .= '<option value="">' . _SELECT_NOTE_TEMPLATE . '</option>';
- for ($i=0;$i<count($templates);$i++) {
- if ($templates[$i]['TYPE'] == 'TXT' && ($templates[$i]['TARGET'] == 'notes' || $templates[$i]['TARGET'] == '')) {
- $frm_str .= '<option value="';
- $frm_str .= $templates[$i]['ID'];
- $frm_str .= '">';
- $frm_str .= $templates[$i]['LABEL'];
+ $frm_str .= '<option value="">' . _SELECT_NOTE_TEMPLATE . '</option>';
+ for ($i=0;$i<count($templates);$i++) {
+ if ($templates[$i]['TYPE'] == 'TXT' && ($templates[$i]['TARGET'] == 'notes' || $templates[$i]['TARGET'] == '')) {
+ $frm_str .= '<option value="';
+ $frm_str .= $templates[$i]['ID'];
+ $frm_str .= '">';
+ $frm_str .= $templates[$i]['LABEL'];
+ }
+ $frm_str .= '</option>';
}
- $frm_str .= '</option>';
- }
- $frm_str .= '</select><br />';
+ $frm_str .= '</select><br />';
- $frm_str .= '<textarea placeholder="motif de l\'action (optionnel) ..." style="width:98%;height:60px;resize:none;" name="notes" id="notes" onblur="document.getElementById(\'note_content_to_users\').value=document.getElementById(\'notes\').value;"></textarea>';
+ $frm_str .= '<textarea placeholder="motif de l\'action (optionnel) ..." style="width:98%;height:60px;resize:none;" name="notes" id="notes" onblur="document.getElementById(\'note_content_to_users\').value=document.getElementById(\'notes\').value;"></textarea>';
+ }
$frm_str .='<div id="form2" style="border:none;">';
$frm_str .= '<form name="frm_redirect_dep" id="frm_redirect_dep" method="post" class="forms" action="#">';
$frm_str .= '<input type="hidden" name="chosen_action" id="chosen_action" value="end_action" />';
diff --git a/apps/maarch_entreprise/indexing_searching/change_category_actions.php b/apps/maarch_entreprise/indexing_searching/change_category_actions.php
index 4ba0179fa4e..673f3c84614 100644
--- a/apps/maarch_entreprise/indexing_searching/change_category_actions.php
+++ b/apps/maarch_entreprise/indexing_searching/change_category_actions.php
@@ -17,15 +17,16 @@ if (count($actions) > 0) {
$frmStr .= '<option value="">' . _CHOOSE_ACTION . '</option>';
for ($indAct = 0; $indAct < count($actions); $indAct ++) {
- if ($indAct == 0 && $_SESSION['current_basket']['id'] == 'IndexingBasket' && count($actions) > 1) {
+ //A quoi sert cette condition? si elle est active elle n'affiche pas toutes les actions dans la page d'indexation.
+ /*if ($indAct == 0 && $_SESSION['current_basket']['id'] == 'IndexingBasket' && count($actions) > 1) {
- } else {
+ } else {*/
$frmStr .= '<option value="' . $actions[$indAct]['VALUE'] . '"';
if ($indAct == 0) {
$frmStr .= 'selected="selected"';
}
$frmStr .= '>' . $actions[$indAct]['LABEL'] . '</option>';
- }
+ /*}*/
}
diff --git a/core/manage_action.php b/core/manage_action.php
index 706ba78499d..74afa373c5a 100644
--- a/core/manage_action.php
+++ b/core/manage_action.php
@@ -140,7 +140,7 @@ if($_POST['req'] == 'valid_form' && !empty($_POST['action_id']) && isset($_POST[
exit();
}
}
-elseif(trim($_POST['req']) == 'change_status' && !empty($_POST['values']) && !empty($_POST['new_status']) && !empty($_POST['table']))
+elseif(trim($_POST['req']) == 'change_status' && !empty($_POST['values'])&& $_POST['values'] != 'none#' && !empty($_POST['new_status']) && !empty($_POST['table']))
{
$stmt = $db->query("select id from status where id = ?", array($_POST['new_status']));
$lineStatus = $stmt->fetchObject();
--
GitLab