apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 6988: addVpnUser did not camel case the "username" which resulted in that particular value not being returned.

Browse Source
This commit is contained in:
will 2010-11-04 12:06:21 -07:00
parent bd4f3bfaa0
commit 70b4c4d181
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/api/commands/AddVpnUserCmd.java
View File

@ -36,7 +36,7 @@ import com.cloud.user.UserContext;
public class AddVpnUserCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AddVpnUserCmd.class.getName());
private static final String s_name = "addvpnuserresponse";
private static final String s_name = "vpnuser";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -97,7 +97,7 @@ public class AddVpnUserCmd extends BaseAsyncCmd {
VpnUserVO vpnUser = (VpnUserVO)getResponseObject();
VpnUsersResponse vpnResponse = new VpnUsersResponse();
vpnResponse.setId(vpnUser.getId());
vpnResponse.setUsername(vpnUser.getUsername());
vpnResponse.setUserName(vpnUser.getUsername());
vpnResponse.setAccountName(vpnUser.getAccountName());
Account accountTemp = ApiDBUtils.findAccountById(vpnUser.getAccountId());

2
server/src/com/cloud/api/commands/ListVpnUsersCmd.java
View File

@ -92,7 +92,7 @@ public class ListVpnUsersCmd extends BaseListCmd {
for (VpnUserVO vpnUser : vpnUsers) {
VpnUsersResponse vpnResponse = new VpnUsersResponse();
vpnResponse.setId(vpnUser.getId());
vpnResponse.setUsername(vpnUser.getUsername());
vpnResponse.setUserName(vpnUser.getUsername());
vpnResponse.setAccountName(vpnUser.getAccountName());
Account accountTemp = ApiDBUtils.findAccountById(vpnUser.getAccountId());

8
server/src/com/cloud/api/response/VpnUsersResponse.java
View File

@ -48,11 +48,11 @@ public class VpnUsersResponse extends BaseResponse {
this.id = id;
}
public String getUsername() {
public String getUserName() {
return userName;
}
public void setUsername(String name) {
public void setUserName(String name) {
this.userName = name;
}
@ -78,5 +78,7 @@ public class VpnUsersResponse extends BaseResponse {
return domainName;
}
public String toString() {
return "id: " + getId() + ", username: " + getUserName() + ", account: " + getAccountName() + ", domainid: " + getDomainId();
}
}

2
ui/scripts/cloud.core.ipaddress.js
View File

@ -512,7 +512,7 @@ function showVpnUsers() {
if (result.jobstatus == 1) { // Succeeded
$thisDialog.dialog("close");
$("#tab_content_vpn #grid_content").append(vpnUserJsonToTemplate(result.jobresult.addvpnuserresponse).fadeIn());
$("#tab_content_vpn #grid_content").append(vpnUserJsonToTemplate(result.jobresult.vpnuser).fadeIn());
} else if (result.jobstatus == 2) { // Failed
var errorMsg = "We were unable to add user access to your VPN. Please contact support.";
$thisDialog.find("#info_container").text(errorMsg).show();