Skip to content
Snippets Groups Projects
Commit 9a3f49c5 authored by Yas Naoi's avatar Yas Naoi
Browse files

Fixed a bug at 'aws_cloud_get_instances_action' for 'access own console' and...

Fixed a bug at 'aws_cloud_get_instances_action' for 'access own console' and 'terminate own instance'.
parent fff77536
No related branches found
No related tags found
No related merge requests found
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
*/ */
/** /**
* Updated by yas 2015/03/25
* Updated by Abhijit 2011/09/08 * Updated by Abhijit 2011/09/08
* Updated by Abhijit 2011/09/07 * Updated by Abhijit 2011/09/07
* Updated by Jiten 2011/07/06 * Updated by Jiten 2011/07/06
...@@ -396,10 +397,12 @@ function aws_cloud_get_instances_action($cloud_context, $instance_info) { ...@@ -396,10 +397,12 @@ function aws_cloud_get_instances_action($cloud_context, $instance_info) {
$action_data = array(); $action_data = array();
$cloud_menu_path = cloud_get_menu_path( $cloud_context ) ; $cloud_menu_path = cloud_get_menu_path( $cloud_context ) ;
$user_keys_all = aws_cloud_get_all_keys($cloud_context);
$instance_id = $instance_info['instance_id']; $instance_id = $instance_info['instance_id'];
$instance_name = trim($instance_info['name']) ; $instance_name = trim($instance_info['name']) ;
$state = $instance_info['state'] ; $state = $instance_info['state'] ;
$key_name = $instance_info['user'] ;
$action_data[] = cloud_display_action( 'images/icon_clear', t('Edit'), $cloud_menu_path . '/instances/describe/' . $instance_id . '/info', array('query' => array('instance_id' => $instance_id), 'html' => TRUE) ); $action_data[] = cloud_display_action( 'images/icon_clear', t('Edit'), $cloud_menu_path . '/instances/describe/' . $instance_id . '/info', array('query' => array('instance_id' => $instance_id), 'html' => TRUE) );
if ($state != 'terminated' && $state != 'stopped') { if ($state != 'terminated' && $state != 'stopped') {
...@@ -426,7 +429,7 @@ function aws_cloud_get_instances_action($cloud_context, $instance_info) { ...@@ -426,7 +429,7 @@ function aws_cloud_get_instances_action($cloud_context, $instance_info) {
$action_data[] = cloud_display_action( 'images/action_stop', t('Terminate'), $cloud_menu_path . '/instances/terminate', array('query' => array('instance_id' => $instance_id, 'name' => $instance_name), 'html' => TRUE), $prop['onclick']); $action_data[] = cloud_display_action( 'images/action_stop', t('Terminate'), $cloud_menu_path . '/instances/terminate', array('query' => array('instance_id' => $instance_id, 'name' => $instance_name), 'html' => TRUE), $prop['onclick']);
} }
elseif (user_access($cloud_context . ' terminate own instance')) { elseif (user_access($cloud_context . ' terminate own instance')) {
if (in_array($form['KeyName'][$key]['#value'], $user_keys_all)) { if (in_array($key_name, $user_keys_all)) {
$action_data[] = cloud_display_action('images/icon_reboot', t('Reboot'), $cloud_menu_path . '/instances/reboot', array('query' => array('instance_id' => $instance_id, 'name' => $instance_name), 'html' => TRUE), $prop_reboot['onclick']); $action_data[] = cloud_display_action('images/icon_reboot', t('Reboot'), $cloud_menu_path . '/instances/reboot', array('query' => array('instance_id' => $instance_id, 'name' => $instance_name), 'html' => TRUE), $prop_reboot['onclick']);
$action_data[] = cloud_display_action('images/action_stop', t('Terminate'), $cloud_menu_path . '/instances/terminate', array('query' => array('instance_id' => $instance_id, 'name' => $instance_name), 'html' => TRUE), $prop['onclick']); $action_data[] = cloud_display_action('images/action_stop', t('Terminate'), $cloud_menu_path . '/instances/terminate', array('query' => array('instance_id' => $instance_id, 'name' => $instance_name), 'html' => TRUE), $prop['onclick']);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment