drive mapping same letter fix

This commit is contained in:
vfedosevich 2015-04-22 07:21:15 -07:00
parent e8643e17dd
commit 8f83314bda
5 changed files with 60 additions and 47 deletions

View file

@ -1650,12 +1650,12 @@ namespace WebsitePanel.EnterpriseServer
return result;
}
public static ResultObject DeleteMappedDrive(int itemId, string driveLetter)
public static ResultObject DeleteMappedDrive(int itemId, string folderName)
{
return DeleteMappedDriveInternal(itemId, driveLetter);
return DeleteMappedDriveInternal(itemId, folderName);
}
protected static ResultObject DeleteMappedDriveInternal(int itemId, string driveLetter)
protected static ResultObject DeleteMappedDriveInternal(int itemId, string folderName)
{
ResultObject result = TaskManager.StartResultTask<ResultObject>("ENTERPRISE_STORAGE", "DELETE_MAPPED_DRIVE", itemId);
@ -1670,9 +1670,16 @@ namespace WebsitePanel.EnterpriseServer
return result;
}
EnterpriseStorage es = GetEnterpriseStorage(GetEnterpriseStorageServiceID(org.PackageId));
var webDavSetting = ObjectUtils.FillObjectFromDataReader<WebDavSetting>(
DataProvider.GetEnterpriseFolder(itemId, folderName));
string path = string.Format(@"\\{0}@SSL\{1}\{2}", webDavSetting.Domain.Split('.')[0], org.OrganizationId, folderName);
Organizations orgProxy = OrganizationController.GetOrganizationProxy(org.ServiceId);
orgProxy.DeleteMappedDrive(org.OrganizationId, driveLetter);
orgProxy.DeleteMappedDriveByPath(org.OrganizationId, path);
}
catch (Exception ex)
{