tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-02-10 Vanessa Gil <vanessa.gil@artica.es> 

* include/functions_events.php
	  operation/events/events_list.php
	  operation/events/events_validate: Allowed post a comment 
	without changing the event's state.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5556 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-02-10 13:57:36 +00:00
parent 0a9f2ccda4
commit b17519d2a0
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-02-10 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_events.php
operation/events/events_list.php
operation/events/events_validate: Allowed post a comment
without changing the event's state.
2012-02-10 Miguel de Dios <miguel.dedios@artica.es>
* * extensions/module_groups.php, include/functions_modules.php,

11
pandora_console/include/functions_events.php
View File

@ -172,7 +172,10 @@ function events_validate_event ($id_event, $similars = true, $comment = '', $new
$new_status_string = __('Validated');
break;
case 2:
$new_status_string = __('Setted in process');
$new_status_string = __('Set in process');
break;
case 3:
$new_status_string = __('Added comment');
break;
}
@ -194,7 +197,11 @@ function events_validate_event ($id_event, $similars = true, $comment = '', $new
if($fullevent['user_comment'] != ''){
$comment .= '<br>'.$fullevent['user_comment'];
}
if ($new_status == 3){ //only add a comment
$new_status = $fullevent["estado"];
}
$values = array(
'estado' => $new_status,
'id_usuario' => $config['id_user'],

12
pandora_console/operation/events/events_list.php
View File

@ -844,15 +844,17 @@ foreach ($result as $event) {
$string .= '<td align="left" width="450px"><b>' . html_print_textarea("comment_".$event["id_evento"], 2, 10, '', 'style="min-height: 10px; width: 250px;"', true) . '</b></td>';
$string .= '<td align="left" width="200px">';
$string .= '<div style="text-align:center;">';
if($event["estado"] == 0) {
$string .= html_print_select(array('1' => __('Validate'), '2' => __('Set in process')), 'select_validate_'.$event["id_evento"], '', '', '', 0, true, false, false, 'select_validate').'<br><br>';
$string .= html_print_select(array('1' => __('Validate'), '2' => __('Set in process'), '3' => __('Add comment')), 'select_validate_'.$event["id_evento"], '', '', '', 0, true, false, false, 'select_validate').'<br><br>';
}
$string .= '<a class="validate_event" href="javascript: toggleCommentForm(' . $event['id_evento'] . ')" id="validate-'.$event["id_evento"].'">';
if($event["estado"] == 2) {
$string .= html_print_button (__('Validate'), 'validate', false, '', 'class="sub ok validate_event" id="validate-'.$event["id_evento"].'"', true).'</div>';
}else {
$string .= html_print_button (__('Change status'), 'validate', false, '', 'class="sub ok validate_event" id="validate-'.$event["id_evento"].'"', true).'</div>';
$string .= html_print_select(array('1' => __('Validate'), '3' => __('Add comment')), 'select_validate_'.$event["id_evento"], '', '', '', 0, true, false, false, 'select_validate').'<br><br>';
}
$string .= '<a class="validate_event" href="javascript: toggleCommentForm(' . $event['id_evento'] . ')" id="validate-'.$event["id_evento"].'">';
$string .= html_print_button (__('Change status'), 'validate', false, '', 'class="sub ok validate_event" id="validate-'.$event["id_evento"].'"', true).'</div>';
$string .= '</a>';
$string .= '</td><td width="400px">';
if($event["id_alert_am"] != 0) {

3
pandora_console/operation/events/events_validate.php
View File

@ -100,7 +100,8 @@ $string .= '<td align="left" width="450px"><b>' . html_print_textarea("comment"
$string .= '<td align="left" width="200px">';
$string .= '<div style="text-align:center;">';
$string .= html_print_select(array('1' => __('Validate'), '2' => __('Set in process')), 'select_validate', '', '', '', 0, true, false, false, 'select_validate').'<br><br>';
$string .= html_print_select(array('1' => __('Validate'), '2' => __('Set in process'), '3' => __('Add comment')), 'select_validate', '', '', '', 0, true, false, false, 'select_validate').'<br><br>';
$string .= html_print_submit_button (__('Change status'), 'validate', false, 'class="sub ok validate_event" id="validate"', true).'</div>';
$string .= '</td><td width="400px">';