Merge commit

This commit is contained in:
robvde 2015-01-14 10:45:44 +08:00
commit a79809bef3
81 changed files with 1489 additions and 392 deletions

View file

@ -99,10 +99,10 @@ namespace WebsitePanel.EnterpriseServer
}
[WebMethod]
public RdsServersPaged GetFreeRdsServersPaged(string filterColumn, string filterValue,
public RdsServersPaged GetFreeRdsServersPaged(int packageId, string filterColumn, string filterValue,
string sortColumn, int startRow, int maximumRows)
{
return RemoteDesktopServicesController.GetFreeRdsServersPaged(filterColumn, filterValue,
return RemoteDesktopServicesController.GetFreeRdsServersPaged(packageId, filterColumn, filterValue,
sortColumn, startRow, maximumRows);
}