CLOUDSTACK-8990: start a stopped machine on a specific determinable host on UI

ustcweizhou · ustcweizhou · commit 6cced18fd673 · 2015-10-26T14:29:29.000+01:00
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
@@ -12363,11 +12363,13 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
   background-position: 1px -583px;
 }
 
-.start .icon {
+.start .icon,
+.startByAdmin .icon {
   background-position: -169px -1px;
 }
 
-.start:hover .icon {
+.start:hover .icon,
+.startByAdmin:hover .icon {
   background-position: -169px -583px;
 }
 
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
@@ -520,6 +520,107 @@
                             poll: pollAsyncJobResult
                         }
                     },
+                    startByAdmin: {
+                        label: 'label.action.start.instance',
+                        createForm: {
+                            title: 'label.action.start.instance',
+                            desc: 'message.action.start.instance',
+                            fields: {
+                                hostId: {
+                                    label: 'label.host',
+                                    isHidden: function(args) {
+                                        if (isAdmin())
+                                            return false;
+                                        else
+                                            return true;
+                                    },
+                                    select: function(args) {
+                                        if (isAdmin()) {
+                                            $.ajax({
+                                                url: createURL("listHosts&state=Up&type=Routing&zoneid=" + args.context.instances[0].zoneid),
+                                                dataType: "json",
+                                                async: true,
+                                                success: function(json) {
+                                                    if (json.listhostsresponse.host != undefined) {
+                                                        hostObjs = json.listhostsresponse.host;
+                                                        var items = [{
+                                                            id: -1,
+                                                            description: 'Default'
+                                                        }];
+                                                        $(hostObjs).each(function() {
+                                                            items.push({
+                                                                id: this.id,
+                                                                description: this.name
+                                                            });
+                                                        });
+                                                        args.response.success({
+                                                            data: items
+                                                        });
+                                                    } else {
+                                                        cloudStack.dialog.notice({
+                                                            message: _l('No Hosts are avaialble')
+                                                        });
+                                                    }
+                                                }
+                                            });
+                                        } else {
+                                            args.response.success({
+                                                data: null
+                                            });
+                                        }
+                                    }
+                                },
+                            }
+                        },
+                        action: function(args) {
+                            var data = {
+                                id: args.context.instances[0].id
+                            }
+                            if (args.$form.find('.form-item[rel=hostId]').css("display") != "none" && args.data.hostId != -1) {
+                                $.extend(data, {
+                                    hostid: args.data.hostId
+                                });
+                            }
+                            $.ajax({
+                                url: createURL("startVirtualMachine"),
+                                data: data,
+                                dataType: "json",
+                                async: true,
+                                success: function(json) {
+                                    var jid = json.startvirtualmachineresponse.jobid;
+                                    args.response.success({
+                                        _custom: {
+                                            jobId: jid,
+                                            getUpdatedItem: function(json) {
+                                                return json.queryasyncjobresultresponse.jobresult.virtualmachine;
+                                            },
+                                            getActionFilter: function() {
+                                                return vmActionfilter;
+                                            }
+                                        }
+                                    });
+                                }
+                            });
+                        },
+                        messages: {
+                            confirm: function(args) {
+                                return 'message.action.start.instance';
+                            },
+                            notification: function(args) {
+                                return 'label.action.start.instance';
+                            },
+                            complete: function(args) {
+                                if (args.password != null) {
+                                    return 'label.vm.password' + ' ' + args.password;
+                                }
+
+                                return false;
+                            }
+                        },
+                        notification: {
+                            poll: pollAsyncJobResult
+                        }
+                    },
                     stop: {
                         label: 'label.action.stop.instance',
                         compactLabel: 'label.stop',
@@ -2464,7 +2565,10 @@
             allowedActions.push("viewConsole");
         } else if (jsonObj.state == 'Stopped') {
             allowedActions.push("edit");
-            allowedActions.push("start");
+            if (isAdmin())
+                allowedActions.push("startByAdmin");
+            else
+                allowedActions.push("start");
             allowedActions.push("destroy");
             allowedActions.push("reinstall");
 

Original file line number	Diff line number	Diff line change
`@@ -12363,11 +12363,13 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it`
`12363`	`12363`	`background-position: 1px -583px;`
`12364`	`12364`	`}`
`12365`	`12365`
`12366`		`-.start .icon {`
	`12366`	`+.start .icon,`
	`12367`	`+.startByAdmin .icon {`
`12367`	`12368`	`background-position: -169px -1px;`
`12368`	`12369`	`}`
`12369`	`12370`
`12370`		`-.start:hover .icon {`
	`12371`	`+.start:hover .icon,`
	`12372`	`+.startByAdmin:hover .icon {`
`12371`	`12373`	`background-position: -169px -583px;`
`12372`	`12374`	`}`
`12373`	`12375`