cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milamberspace <...@git.apache.org>
Subject [GitHub] cloudstack pull request: CLOUDSTACK-8961: Changes related to the U...
Date Thu, 29 Oct 2015 19:32:42 GMT
Github user milamberspace commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/941#discussion_r43433480
  
    --- Diff: ui/scripts/network.js ---
    @@ -4495,99 +4511,11 @@
                                                     $('<li>').addClass('psk').html(_l('message.enabled.vpn.ip.sec')
+ ' ')
                                                     .append($('<strong>').html(psk))
                                                 )
    -                                    ).multiEdit({
    -                                        context: args.context,
    -                                        noSelect: true,
    -                                        fields: {
    -                                            'username': {
    -                                                edit: true,
    -                                                label: 'label.username'
    -                                            },
    -                                            'password': {
    -                                                edit: true,
    -                                                isPassword: true,
    -                                                label: 'label.password'
    -                                            },
    -                                            'add-user': {
    -                                                addButton: true,
    -                                                label: 'label.add.user'
    -                                            }
    -                                        },
    -                                        add: {
    -                                            label: 'label.add.user',
    -                                            action: function(args) {
    -                                                $.ajax({
    -                                                    url: createURL('addVpnUser'),
    -                                                    data: $.extend(args.data, {
    -                                                        domainid: args.context.ipAddresses[0].domainid,
    -                                                        account: args.context.ipAddresses[0].account
    -                                                    }),
    -                                                    dataType: 'json',
    -                                                    type: "POST",
    -                                                    success: function(data) {
    -                                                        args.response.success({
    -                                                            _custom: {
    -                                                                jobId: data.addvpnuserresponse.jobid
    -                                                            },
    -                                                            notification: {
    -                                                                label: 'label.add.vpn.user',
    -                                                                poll: pollAsyncJobResult
    -                                                            }
    -                                                        });
    -                                                    },
    -                                                    error: function(data) {
    -                                                        args.response.error(parseXMLHttpResponse(data));
    -                                                    }
    -                                                });
    -                                            }
    -                                        },
    -                                        actions: {
    -                                            destroy: {
    -                                                label: 'label.action.delete.user',
    -                                                action: function(args) {
    -                                                    $.ajax({
    -                                                        url: createURL('removeVpnUser'),
    -                                                        data: {
    -                                                            domainid: args.context.multiRule[0].domainid,
    -                                                            account: args.context.multiRule[0].account,
    -                                                            username: args.context.multiRule[0].username
    -                                                        },
    -                                                        dataType: 'json',
    -                                                        async: true,
    -                                                        success: function(data) {
    -                                                            var jobID = data.removevpnuserresponse.jobid;
    -
    -                                                            args.response.success({
    -                                                                _custom: {
    -                                                                    jobId: jobID
    -                                                                },
    -                                                                notification: {
    -                                                                    label: 'label.delete.vpn.user',
    -                                                                    poll: pollAsyncJobResult
    -                                                                }
    -                                                            });
    -                                                        }
    -                                                    });
    -                                                }
    -                                            }
    -                                        },
    -                                        dataProvider: function(args) {
    -                                            $.ajax({
    -                                                url: createURL('listVpnUsers'),
    -                                                data: {
    -                                                    domainid: args.context.ipAddresses[0].domainid,
    -                                                    account: args.context.ipAddresses[0].account
    -                                                },
    -                                                dataType: 'json',
    -                                                async: true,
    -                                                success: function(data) {
    -                                                    args.response.success({
    -                                                        data: data.listvpnusersresponse.vpnuser
    -                                                    });
    -                                                }
    -                                            });
    -                                        }
    -                                    });
    +                                            .append(
    +                                                //Note
    +                                                $('<li>').html('Note: VPN users
are now accessed by changing views at the networks tab.')
    --- End diff --
    
    Would be better to use a new localization key and put the text in messages.properties
file. Thanks.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message