IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Files: fixed merge

Browse Source
This commit is contained in:
Nikita Gopienko 2020-03-04 16:22:56 +03:00
parent ed9c15864a
commit 22e2729cc5
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/ASC.Web.Common/src/api/files/filter.js
View File

@ -31,9 +31,8 @@ class FilesFilter {
filterType = DEFAULT_FILTER_TYPE,
withSubfolders = DEFAULT_SEARCH_TYPE,
search = DEFAULT_SEARCH,
treeFolders = DEFAULT_FOLDER_PATH,
authorType = DEFAULT_AUTHOR_TYPE,
treeFolders = DEFAULT_FOLDER_PATH
) {
this.page = page;
this.pageCount = pageCount;
@ -43,8 +42,8 @@ class FilesFilter {
this.withSubfolders = withSubfolders;
this.search = search;
this.total = total;
this.treeFolders = treeFolders;
this.authorType = authorType;
this.treeFolders = treeFolders;
}
getStartIndex = () => {
@ -103,7 +102,6 @@ class FilesFilter {
this.withSubfolders,
this.search,
this.authorType,
this.treeFolders
);
}
@ -117,7 +115,6 @@ class FilesFilter {
this.sortBy === filter.sortBy &&
this.sortOrder === filter.sortOrder &&
this.page === filter.page &&
this.authorType === filter.authorType &&
this.pageCount === filter.pageCount;
return equals;