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

2010-12-20 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/reporting/reporting_builder.php: fixed the action to sort up or
	down the items in the report, and improvement the order number and now
	start to each new report.
	
	Fixes: #3140930



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3672 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-12-20 20:45:58 +00:00
parent 9aac97b2b0
commit de0eb7b681
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2010-12-20 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.php: fixed the action to sort up or
down the items in the report, and improvement the order number and now
start to each new report.
Fixes: #3140930
2010-12-20 Miguel de Dios <miguel.dedios@artica.es> 2010-12-20 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.item_editor.php: fixed the copy & * godmode/reporting/reporting_builder.item_editor.php: fixed the copy &

12
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -246,7 +246,14 @@ switch ($action) {
else { else {
$idItem = $result; $idItem = $result;
$max = get_db_all_rows_sql('select max(`order`) as max from treport_content;'); $max = $max[0]['max']; $max = get_db_all_rows_sql('SELECT max(`order`) AS max
FROM treport_content WHERE id_report = ' . $idReport . ';');
if ($max === false) {
$max = 0;
}
else {
$max = $max[0]['max'];
}
process_sql_update('treport_content', array('`order`' => $max + 1), array('id_rc' => $idItem)); process_sql_update('treport_content', array('`order`' => $max + 1), array('id_rc' => $idItem));
$resultOperationDB = true; $resultOperationDB = true;
@ -368,7 +375,8 @@ switch ($action) {
} }
process_sql_begin(); process_sql_begin();
$resultOperationDB = process_sql_update('treport_content', array('`order`' => $oldOrder), array('`order`' => $newOrder, 'id_rc' => $idReport)); $resultOperationDB = process_sql_update('treport_content',
array('`order`' => $oldOrder), array('`order`' => $newOrder, 'id_report' => $idReport));
if ($resultOperationDB !== false) { if ($resultOperationDB !== false) {
$resultOperationDB = process_sql_update('treport_content', array('`order`' => $newOrder), array('id_rc' => $idItem)); $resultOperationDB = process_sql_update('treport_content', array('`order`' => $newOrder), array('id_rc' => $idItem));
if ($resultOperationDB !== false) { if ($resultOperationDB !== false) {