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

Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files

Browse Source
This commit is contained in:
Nikita Gopienko 2020-06-26 15:55:54 +03:00
commit 792f8ff7a8
8 changed files with 4653 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/install/docker/Dockerfile
View File

@ -184,8 +184,6 @@ RUN mkdir -p /var/mysqld/ && \
mysql -D "onlyoffice" < /app/onlyoffice/dotnet_dump.sql && \
mysql -D "onlyoffice" -e 'CREATE USER IF NOT EXISTS "onlyoffice_user"@"localhost" IDENTIFIED WITH mysql_native_password BY "onlyoffice_pass";' && \
mysql -D "onlyoffice" -e 'GRANT ALL PRIVILEGES ON *.* TO 'onlyoffice_user'@'localhost';' && \
mysql -D "onlyoffice" -e 'UPDATE core_user SET email = "paul.bannov@gmail.com";' && \
mysql -D "onlyoffice" -e 'UPDATE core_usersecurity SET pwdhash = "vLFfghR5tNV3K9DKhmwArV+SbjWAcgZZzIDTnJ0JgCo=", pwdhashsha512 = "USubvPlB+ogq0Q1trcSupg==";' && \
killall -u mysql -n mysql
RUN rm -rf /var/lib/apt/lists/*

4901
build/install/docker/config/mysql/dotnet_dump.sql
View File

File diff suppressed because one or more lines are too long

4
common/services/ASC.Thumbnails.Svc/ASC.Thumbnails.Svc.csproj
View File

@ -17,4 +17,8 @@
<ProjectReference Include="..\..\ASC.Data.Storage\ASC.Data.Storage.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>

6
common/services/ASC.Thumbnails.Svc/Program.cs
View File

@ -61,12 +61,12 @@ namespace ASC.Thumbnails.Svc
}
)
.AddJsonFile("appsettings.json")
.AddJsonFile($"appsettings.{env}.json", true)
.AddJsonFile($"urlshortener.{env}.json", true)
.AddJsonFile("storage.json")
.AddJsonFile("kafka.json")
.AddJsonFile("thumb.json")
.AddJsonFile($"kafka.{env}.json", true)
.AddJsonFile($"kafka.{env}.json", true)
.AddJsonFile($"appsettings.{env}.json", true)
.AddJsonFile($"thumb.{env}.json", true)
.AddEnvironmentVariables()
.AddCommandLine(args);
})

5
config/thumb.test.json Normal file
View File

@ -0,0 +1,5 @@
{
"thumb": {
"path": "../client/"
}
}

25
products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
View File

@ -174,7 +174,7 @@ class FilesRowContent extends React.PureComponent {
};
onShowVersionHistory = (e) => {
const {settings, history} = this.props;
const { settings, history } = this.props;
const fileId = e.currentTarget.dataset.id;
history.push(`${settings.homepage}/${fileId}/history`);
@ -192,7 +192,8 @@ class FilesRowContent extends React.PureComponent {
fileStatus,
foldersCount,
id,
versionGroup
versionGroup,
newItems
} = item;
const SimpleFilesRowContent = styled(RowContent)`
@ -269,7 +270,7 @@ class FilesRowContent extends React.PureComponent {
{titleWithoutExt}
</Link>
<>
{fileExst &&
{fileExst ?
<div className='badges'>
<Text
className='badge-ext'
@ -345,6 +346,24 @@ class FilesRowContent extends React.PureComponent {
/>
}
</div>
:
<div className='badges'>
{ newItems && newItems > 0 &&
<Badge
className='badge-version'
backgroundColor="#ED7309"
borderRadius="11px"
color="#FFFFFF"
fontSize="10px"
fontWeight={800}
label={newItems}
maxWidth="50px"
onClick={this.onShowVersionHistory}
padding="0 5px"
data-id={id}
/>
}
</div>
}
</>
<Text

2
products/ASC.Files/Server/Core/FileStorageService.cs
View File

@ -1044,7 +1044,7 @@ namespace ASC.Web.Files.Services.WCFService
if (!result.Any())
{
//MarkAsRead(new List<JsonElement>() { folderId }, new List<JsonElement>() { }); //TODO
MarkAsRead(new List<JsonElement>() { JsonDocument.Parse(folderId.ToString()).RootElement }, new List<JsonElement>() { }); //TODO
}

1
web/ASC.Web.Api/ASC.Web.Api.csproj
View File

@ -33,7 +33,6 @@
<ProjectReference Include="..\..\common\ASC.Common\ASC.Common.csproj" />
<ProjectReference Include="..\..\common\ASC.Core.Common\ASC.Core.Common.csproj" />
<ProjectReference Include="..\..\common\ASC.Data.Reassigns\ASC.Data.Reassigns.csproj" />
<ProjectReference Include="..\..\common\services\ASC.Thumbnails.Svc\ASC.Thumbnails.Svc.csproj" />
<ProjectReference Include="..\ASC.Web.Core\ASC.Web.Core.csproj" />
</ItemGroup>