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

IDE0017

Browse Source
This commit is contained in:
pavelbannov 2019-08-15 16:35:18 +03:00
parent 52e1ad7d71
commit 96dd3cd657
8 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/ASC.Core.Common/Notify/Cron/CronExpression.cs
View File

@ -150,8 +150,10 @@ namespace ASC.Notify.Cron
CronExpression copy;
try
{
copy = new CronExpression(CronExpressionString);
copy.TimeZone = TimeZone;
copy = new CronExpression(CronExpressionString)
{
TimeZone = TimeZone
};
}
catch (FormatException)
{

16
common/ASC.Core.Common/Notify/Engine/NotifyRequest.cs
View File

@ -122,13 +122,15 @@ namespace ASC.Notify.Engine
internal NotifyRequest Split(IRecipient recipient)
{
if (recipient == null) throw new ArgumentNullException("recipient");
var newRequest = new NotifyRequest(NotifySource, NotifyAction, ObjectID, recipient);
newRequest.SenderNames = SenderNames;
newRequest.Patterns = Patterns;
newRequest.Arguments = new List<ITagValue>(Arguments);
newRequest.RequaredTags = RequaredTags;
newRequest.CurrentSender = CurrentSender;
newRequest.CurrentMessage = CurrentMessage;
var newRequest = new NotifyRequest(NotifySource, NotifyAction, ObjectID, recipient)
{
SenderNames = SenderNames,
Patterns = Patterns,
Arguments = new List<ITagValue>(Arguments),
RequaredTags = RequaredTags,
CurrentSender = CurrentSender,
CurrentMessage = CurrentMessage
};
newRequest.Interceptors.AddRange(Interceptors);
return newRequest;
}

8
common/ASC.Core.Common/Notify/Model/NotifyClientImpl.cs
View File

@ -141,9 +141,11 @@ namespace ASC.Notify.Model
if (action == null) throw new ArgumentNullException("action");
if (recipient == null) throw new ArgumentNullException("recipient");
var request = new NotifyRequest(notifySource, action, objectID, recipient);
request.SenderNames = senders;
request.IsNeedCheckSubscriptions = checkSubsciption;
var request = new NotifyRequest(notifySource, action, objectID, recipient)
{
SenderNames = senders,
IsNeedCheckSubscriptions = checkSubsciption
};
if (args != null) request.Arguments.AddRange(args);
return request;
}

6
common/ASC.Core.Common/Notify/Senders/AWSSender.cs
View File

@ -143,8 +143,10 @@ namespace ASC.Core.Notify.Senders
Body body;
if (m.ContentType == Pattern.HTMLContentType)
{
body = new Body(new Content(HtmlUtil.GetText(m.Content)) { Charset = Encoding.UTF8.WebName });
body.Html = new Content(GetHtmlView(m.Content)) { Charset = Encoding.UTF8.WebName };
body = new Body(new Content(HtmlUtil.GetText(m.Content)) { Charset = Encoding.UTF8.WebName })
{
Html = new Content(GetHtmlView(m.Content)) { Charset = Encoding.UTF8.WebName }
};
}
else
{

7
common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
View File

@ -606,9 +606,10 @@ namespace ASC.Data.Storage.GoogleCloud
var size = GetFileSize(srcdomain, srcpath);
var options = new CopyObjectOptions();
options.DestinationPredefinedAcl = GetDomainACL(newdomain);
var options = new CopyObjectOptions
{
DestinationPredefinedAcl = GetDomainACL(newdomain)
};
storage.CopyObject(_bucket, MakePath(srcdomain, srcpath), _bucket, MakePath(newdomain, newpath), options);

6
web/ASC.Web.Core/Calendars/SharingOptions.cs
View File

@ -74,8 +74,10 @@ namespace ASC.Web.Core.Calendars
public object Clone()
{
var o = new SharingOptions();
o.SharedForAll = this.SharedForAll;
var o = new SharingOptions
{
SharedForAll = this.SharedForAll
};
foreach (var i in this.PublicItems)
o.PublicItems.Add(new PublicItem() { Id = i.Id, IsGroup = i.IsGroup });

32
web/ASC.Web.Core/Helpers/ImageHelpers.cs
View File

@ -447,8 +447,10 @@ namespace ASC.Web.Studio.Helpers
maxWidth,
maxHeight,
maxWidthPreview,
maxHeightPreview);
_generator.store = store;
maxHeightPreview)
{
store = store
};
_generator.DoThumbnail(path, outputPath, ref imageInfo);
}
@ -458,8 +460,10 @@ namespace ASC.Web.Studio.Helpers
maxWidth,
maxHeight,
maxWidthPreview,
maxHeightPreview);
_generator.store = store;
maxHeightPreview)
{
store = store
};
_generator.DoThumbnail(stream, outputPath, ref imageInfo);
}
@ -482,9 +486,10 @@ namespace ASC.Web.Studio.Helpers
maxSize,
maxSize,
maxWidthPreview,
maxHeightPreview);
_generator.store = store;
maxHeightPreview)
{
store = store
};
_generator.DoThumbnail(stream, outputPath, ref imageInfo);
}
@ -517,9 +522,10 @@ namespace ASC.Web.Studio.Helpers
maxSize,
maxSize,
maxWidthPreview,
maxHeightPreview);
_generator.store = store;
maxHeightPreview)
{
store = store
};
_generator.DoPreviewImage(stream, outputPath, ref imageInfo);
}
@ -531,8 +537,10 @@ namespace ASC.Web.Studio.Helpers
maxSize,
maxSize,
maxWidthPreview,
maxHeightPreview);
_generator.store = store;
maxHeightPreview)
{
store = store
};
_generator.RotateImage(path, outputPath, back);
}

6
web/ASC.Web.Core/Users/Import/TextFileUserImporter.cs
View File

@ -98,8 +98,10 @@ namespace ASC.Web.Core.Users.Import
private UserInfo GetExportedUser(string line, IDictionary<int, PropertyInfo> mappedProperties, int fieldsCount)
{
var exportedUser = new UserInfo();
exportedUser.ID = Guid.NewGuid();
var exportedUser = new UserInfo
{
ID = Guid.NewGuid()
};
var dataFields = GetDataFields(line);
for (var j = 0; j < Math.Min(fieldsCount, dataFields.Length); j++)