tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-02-28 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

Browse Source 
* operation/events/events_list.php
	 operation/events/events.php: Changed validation and set in process
	 to javascript code (pending fixes in this feature).
	 
	 Fixes: #3487339



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5657 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-02-28 10:49:33 +00:00
parent 3e674de0a0
commit 4468d26e5e
3 changed files with 24 additions and 3 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 @@
2012-02-28 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/events_list.php
operation/events/events.php: Changed validation and set in process
to javascript code (pending fixes in this feature).
Fixes: #3487339
2012-02-27 Ramon Novoa <rnovoa@artica.es> 2012-02-27 Ramon Novoa <rnovoa@artica.es>
* include/functions_events.php: Fixed an include path. * include/functions_events.php: Fixed an include path.

17
pandora_console/operation/events/events.php
View File

@ -514,13 +514,16 @@ $(document).ready( function() {
row_id_name = $(row).attr('id').split('-').shift(); row_id_name = $(row).attr('id').split('-').shift();
row_id_number = $(row).attr('id').split('-').pop() - 1; row_id_number = $(row).attr('id').split('-').pop() - 1;
row_id_number_next = parseInt($(row).attr('id').split('-').pop()) + 1;
previous_row_id = $(row).attr('id'); previous_row_id = $(row).attr('id');
current_row_id = row_id_name + "-" + row_id_number; current_row_id = row_id_name + "-" + row_id_number;
selected_row_id = row_id_name + "-" + row_id_number + "-0"; selected_row_id = row_id_name + "-" + row_id_number + "-0";
next_row_id = row_id_name + '-' + row_id_number_next;
$("#"+previous_row_id).css('display', 'none'); $("#"+previous_row_id).css('display', 'none');
$("#"+current_row_id).css('display', 'none'); $("#"+current_row_id).css('display', 'none');
$("#"+selected_row_id).css('display', 'none'); $("#"+selected_row_id).css('display', 'none');
$("#"+next_row_id).css('display', 'none');
} }
}); });
} }
@ -551,8 +554,15 @@ $(document).ready( function() {
$("#comment_header_"+id).html(data); $("#comment_header_"+id).html(data);
}); });
// Remove delete link // Remove delete link (if event is not grouped and there is more than one event)
$("#delete-"+id).replaceWith('<img alt="' + <?php echo "'" . __('Is not allowed delete events in process') . "'"; ?> + '" title="' + <?php echo "'" . __('Is not allowed delete events in process') . "'"; ?> + '" src="/trunk/pandora_console/images/cross.disabled.png">'); if ($("#group_rep").val() == 1){
if (parseInt($("#count_event_group_"+id).text()) <= 1){
$("#delete-"+id).replaceWith('<img alt="' + <?php echo "'" . __('Is not allowed delete events in process') . "'"; ?> + '" title="' + <?php echo "'" . __('Is not allowed delete events in process') . "'"; ?> + '" src="images/cross.disabled.png">');
}
}
else{ // Remove delete link (if event is not grouped)
$("#delete-"+id).replaceWith('<img alt="' + <?php echo "'" . __('Is not allowed delete events in process') . "'"; ?> + '" title="' + <?php echo "'" . __('Is not allowed delete events in process') . "'"; ?> + '" src="images/cross.disabled.png">');
}
// Change state image // Change state image
$("#status_img_"+id).attr ("src", "images/hourglass.png"); $("#status_img_"+id).attr ("src", "images/hourglass.png");
@ -569,13 +579,16 @@ $(document).ready( function() {
row_id_name = $(row).attr('id').split('-').shift(); row_id_name = $(row).attr('id').split('-').shift();
row_id_number = $(row).attr('id').split('-').pop() - 1; row_id_number = $(row).attr('id').split('-').pop() - 1;
row_id_number_next = parseInt($(row).attr('id').split('-').pop()) + 1;
previous_row_id = $(row).attr('id'); previous_row_id = $(row).attr('id');
current_row_id = row_id_name + "-" + row_id_number; current_row_id = row_id_name + "-" + row_id_number;
selected_row_id = row_id_name + "-" + row_id_number + "-0"; selected_row_id = row_id_name + "-" + row_id_number + "-0";
next_row_id = row_id_name + '-' + row_id_number_next;
$("#"+previous_row_id).css('display', 'none'); $("#"+previous_row_id).css('display', 'none');
$("#"+current_row_id).css('display', 'none'); $("#"+current_row_id).css('display', 'none');
$("#"+selected_row_id).css('display', 'none'); $("#"+selected_row_id).css('display', 'none');
$("#"+next_row_id).css('display', 'none');
} }
}); });

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

@ -1019,7 +1019,7 @@ foreach ($result as $event) {
if ($group_rep != 0) { if ($group_rep != 0) {
$string .= '<td align="left" valign="top" width="15%">'; $string .= '<td align="left" valign="top" width="15%">';
$string .= '<b>' . __('Count') . '</b></td><td align="left">'; $string .= '<b>' . __('Count') . '</b></td><td id="count_event_group_' . $event["id_evento"] . '" align="left">';
} }
if ($group_rep == 1) { if ($group_rep == 1) {