Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cloud-3221415
Manage
Activity
Members
Labels
Plan
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Issue forks
cloud-3221415
Commits
9689ce46
Commit
9689ce46
authored
11 years ago
by
Yas Naoi
Browse files
Options
Downloads
Patches
Plain Diff
Fixed a bug for Cluster: theme_cloud_cluster_display_server_list
parent
36b1f68a
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/cloud_cluster/cloud_cluster.inc
+12
-10
12 additions, 10 deletions
modules/cloud_cluster/cloud_cluster.inc
with
12 additions
and
10 deletions
modules/cloud_cluster/cloud_cluster.inc
+
12
−
10
View file @
9689ce46
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
*/
*/
/**
/**
* Updated by yas 2013/10/31
* Updated by yas 2011/03/03
* Updated by yas 2011/03/03
* Updated by yas 2011/02/17
* Updated by yas 2011/02/17
* Updated by yas 2011/02/14
* Updated by yas 2011/02/14
...
@@ -1497,12 +1498,13 @@ function theme_cloud_cluster_display_server_list($form) {
...
@@ -1497,12 +1498,13 @@ function theme_cloud_cluster_display_server_list($form) {
$rows
=
array
();
$rows
=
array
();
if
(
isset
(
$form
[
'server_name'
])
)
{
if
(
isset
(
$form
[
'server_name'
])
)
{
foreach
(
element_children
(
$form
[
'server_name'
])
as
$deplkey
)
{
foreach
(
element_children
(
$form
[
'server_name'
])
as
$deplkey
)
{
$row
=
array
(
$row
=
array
(
array
(
array
(
'data'
=>
drupal_render
(
$form
[
'server_name'
][
$deplkey
]),
'data'
=>
drupal_render
(
$form
[
'server_name'
][
$deplkey
]),
'class'
=>
array
(
'nickname-column'
),
'class'
=>
array
(
'nickname-column'
),
),
),
drupal_render
(
$form
[
'instance_nickname'
][
$deplkey
]),
drupal_render
(
$form
[
'instance_nickname'
][
$deplkey
]),
drupal_render
(
$form
[
'Cloud_type'
][
$deplkey
]),
drupal_render
(
$form
[
'Cloud_type'
][
$deplkey
]),
drupal_render
(
$form
[
'Zone'
][
$deplkey
]),
drupal_render
(
$form
[
'Zone'
][
$deplkey
]),
drupal_render
(
$form
[
'Public_ip'
][
$deplkey
]),
drupal_render
(
$form
[
'Public_ip'
][
$deplkey
]),
...
@@ -1513,25 +1515,25 @@ function theme_cloud_cluster_display_server_list($form) {
...
@@ -1513,25 +1515,25 @@ function theme_cloud_cluster_display_server_list($form) {
);
);
$action_data
=
''
;
$action_data
=
''
;
$server_id
=
$form
[
'server_id'
][
$deplkey
][
0
][
'#value'
];
$server_id
=
$form
[
'server_id'
][
$deplkey
][
'#value'
];
if
(
empty
(
$form
[
'Instanceid'
][
$deplkey
][
'#markup'
])
if
(
empty
(
$form
[
'Instanceid'
][
$deplkey
][
0
][
'#markup'
])
||
drupal_strtolower
(
$form
[
'State'
][
$deplkey
][
'#markup'
])
==
'terminated'
||
drupal_strtolower
(
$form
[
'State'
][
$deplkey
][
0
][
'#markup'
])
==
'terminated'
||
drupal_strtolower
(
$form
[
'State'
][
$deplkey
][
'#markup'
])
==
'stopped'
||
drupal_strtolower
(
$form
[
'State'
][
$deplkey
][
0
][
'#markup'
])
==
'stopped'
||
empty
(
$form
[
'State'
][
$deplkey
][
'#markup'
]))
{
||
empty
(
$form
[
'State'
][
$deplkey
][
0
][
'#markup'
]))
{
if
(
user_access
(
'update cluster'
))
{
if
(
user_access
(
'update cluster'
))
{
$action_data
.
=
cloud_display_action
(
$action_data
.
=
cloud_display_action
(
'images/icon_play.png'
,
'images/icon_play.png'
,
'launch'
,
'launch'
,
CLOUD_CLUSTER_PATH
.
'/describe/servers/launch_server/'
.
$cluster_id
.
'/'
.
$server_id
,
CLOUD_CLUSTER_PATH
.
'/describe/servers/launch_server/'
.
$cluster_id
.
'/'
.
$server_id
,
array
(
'query'
=>
array
(
'instance_id'
=>
$form
[
'Instanceid'
][
$deplkey
][
0
][
'#markup'
]),
'html'
=>
TRUE
)
array
(
'query'
=>
array
(
'instance_id'
=>
$form
[
'Instanceid'
][
$deplkey
][
'#markup'
]),
'html'
=>
TRUE
)
);
);
}
}
}
}
elseif
(
empty
(
$form
[
'Instanceid'
][
$deplkey
][
0
][
'#markup'
])
===
FALSE
)
{
elseif
(
empty
(
$form
[
'Instanceid'
][
$deplkey
][
'#markup'
])
===
FALSE
)
{
$instance_id
=
$form
[
'Instanceid'
][
$deplkey
][
0
][
'#markup'
];
$instance_id
=
$form
[
'Instanceid'
][
$deplkey
][
'#markup'
];
if
(
isset
(
$all_instances_list
[
$instance_id
])
)
{
if
(
isset
(
$all_instances_list
[
$instance_id
])
)
{
$action_data
.
=
$all_instances_list
[
$instance_id
][
'action_data'
];
$action_data
.
=
$all_instances_list
[
$instance_id
][
'action_data'
];
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment