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

2012-06-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* godmode/groups/modu_group_list.php: Fixed module update when a 
	module group is deleted.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6637 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-06-20 17:24:43 +00:00
parent d120f6acdf
commit 5e5570f5c4
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-06-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/groups/modu_group_list.php: Fixed module update when a
module group is deleted.
Merged from branches.
2012-06-20 Sergio Martin <sergio.martin@artica.es> 2012-06-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php * include/functions_graph.php

28
pandora_console/godmode/groups/modu_group_list.php
View File

@ -71,18 +71,18 @@ if ($create_group) {
$result = db_process_sql_insert('tmodule_group', array('name' => $name)); $result = db_process_sql_insert('tmodule_group', array('name' => $name));
if ($result) { if ($result) {
echo "<h3 class='suc'>".__('Group successfully created')."</h3>"; ui_print_success_message(__('Group successfully created'));
} }
else { else {
echo "<h3 class='error'>".__('There was a problem creating group')."</h3>"; ui_print_error_message(__('There was a problem creating group'));
} }
} }
else { else {
echo "<h3 class='error'>".__('Each module group must have a different name')."</h3>"; ui_print_error_message(__('Each module group must have a different name'));
} }
} }
else { else {
echo "<h3 class='error'>".__('Module group must have a name')."</h3>"; ui_print_error_message(__('Module group must have a name'));
} }
} }
@ -102,18 +102,18 @@ if ($update_group) {
$result = db_process_sql_update('tmodule_group', array('name' => $name), array('id_mg' => $id_group)); $result = db_process_sql_update('tmodule_group', array('name' => $name), array('id_mg' => $id_group));
if ($result !== false) { if ($result !== false) {
echo "<h3 class='suc'>".__('Group successfully updated')."</h3>"; ui_print_success_message(__('Group successfully updated'));
} }
else { else {
echo "<h3 class='error'>".__('There was a problem modifying group')."</h3>"; ui_print_error_message(__('There was a problem modifying group'));
} }
} }
else { else {
echo "<h3 class='error'>".__('Each module group must have a different name')."</h3>"; ui_print_error_message(__('Each module group must have a different name'));
} }
} }
else { else {
echo "<h3 class='error'>".__('Module group must have a name')."</h3>"; ui_print_error_message(__('Module group must have a name'));
} }
} }
@ -123,10 +123,18 @@ if ($delete_group) {
$result = db_process_sql_delete('tmodule_group', array('id_mg' => $id_group)); $result = db_process_sql_delete('tmodule_group', array('id_mg' => $id_group));
if ($result) {
$result = db_process_sql_update('tagente_modulo', array('id_module_group' => 0), array('id_module_group' => $id_group));
// A group with no modules can be deleted, to avoid a message error then do the follwing
if ($result !== false)
$result = true;
}
if (! $result) if (! $result)
echo "<h3 class='error'>".__('There was a problem deleting group')."</h3>"; ui_print_error_message(__('There was a problem deleting group'));
else else
echo "<h3 class='suc'>".__('Group successfully deleted')."</h3>"; ui_print_success_message(__('Group successfully deleted'));
} }
$total_groups = db_get_num_rows('SELECT * FROM tmodule_group'); $total_groups = db_get_num_rows('SELECT * FROM tmodule_group');