2011-06-16 Miguel de Dios <miguel.dedios@artica.es>

Merge from the branch.
	
	* godmode/alerts/alert_actions.php: fixed the url to copy the alert action.
	The file didn't upload to repository.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4461 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-06-16 15:32:12 +00:00
parent 7250b017c6
commit 458a9e91e5
2 changed files with 8 additions and 1 deletions

View File

@ -1,3 +1,10 @@
2011-06-16 Miguel de Dios <miguel.dedios@artica.es>
Merge from the branch.
* godmode/alerts/alert_actions.php: fixed the url to copy the alert action.
The file didn't upload to repository.
2011-06-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/skin

View File

@ -285,7 +285,7 @@ foreach ($actions as $action) {
$data[0] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_action&id='.$action['id'].'">'.
$action['name'].'</a>';
$data[1] = ui_print_group_icon ($action["id_group"], true) .'&nbsp;'. ui_print_truncate_text(groups_get_name ($action["id_group"], true));
$data[2] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_actions&copy_action=1&id='.$action['id'].'"
$data[2] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_actions&amp;copy_action=1&amp;id='.$action['id'].'"
onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">' .
html_print_image("images/copy.png", true) . '</a>';
$data[3] = '<a href="index.php?sec=galertas&sec2=godmode/alerts/alert_actions&delete_action=1&id='.$action['id'].'"