Merge pull request #3058 from vnetonline/fix-file-manager-show-folders
[ENHANCE] - #3057 FileManager when ShowFolders = False however a Folder is set by path
This commit is contained in:
		@ -168,6 +168,21 @@
 | 
			
		||||
            ShowSuccess = true;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
 | 
			
		||||
        {
 | 
			
		||||
            Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
 | 
			
		||||
            if (folder != null)
 | 
			
		||||
            {
 | 
			
		||||
                FolderId = folder.FolderId;
 | 
			
		||||
            }
 | 
			
		||||
            else
 | 
			
		||||
            {
 | 
			
		||||
                FolderId = -1;
 | 
			
		||||
                _message = "Folder Path " + Folder + "Does Not Exist";
 | 
			
		||||
                _messagetype = MessageType.Error;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (ShowFolders)
 | 
			
		||||
        {
 | 
			
		||||
            _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
 | 
			
		||||
@ -184,21 +199,6 @@
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
 | 
			
		||||
        {
 | 
			
		||||
            Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
 | 
			
		||||
            if (folder != null)
 | 
			
		||||
            {
 | 
			
		||||
                FolderId = folder.FolderId;
 | 
			
		||||
            }
 | 
			
		||||
            else
 | 
			
		||||
            {
 | 
			
		||||
                FolderId = -1;
 | 
			
		||||
                _message = "Folder Path " + Folder + "Does Not Exist";
 | 
			
		||||
                _messagetype = MessageType.Error;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        if (FileId != -1)
 | 
			
		||||
        {
 | 
			
		||||
            File file = await FileService.GetFileAsync(FileId);
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user