Skip to content

Commit dd1e658

Browse files
author
Костюков Александр
committed
fix all managers
1 parent 4e5ce95 commit dd1e658

35 files changed

+1524
-1387
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"debug": true,
55
"targets": {
66
"uglify": false,
7-
"browsers": ["ie >= 8", "> 5%", "last 3 version"]
7+
"browsers": ["ie >= 9", "> 5%", "last 3 version"]
88
}}], "react", "stage-0"
99
],
1010
"ignore": [

.browserslistrc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[production]
2-
ie >= 8
3-
> 3%
2+
ie >= 9
3+
> 5%
44
last 3 version
55

66
[development]
7-
ie >= 8
8-
> 3%
7+
ie >= 9
8+
> 5%
99
last 3 version

bll/Services/SiteService.cs

Lines changed: 40 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,17 @@ namespace Quantumart.QP8.BLL.Services
1717
{
1818
public class SiteService
1919
{
20-
public static SiteInitListResult InitList(int parentId)
20+
public static SiteInitListResult InitList(int parentId) => new SiteInitListResult
2121
{
22-
return new SiteInitListResult
23-
{
24-
IsAddNewAccessable = SecurityRepository.IsActionAccessible(ActionCode.AddNewSite)
25-
};
26-
}
22+
IsAddNewAccessable = SecurityRepository.IsActionAccessible(ActionCode.AddNewSite)
23+
};
2724

28-
public static SiteInitListResult MultipleInitList(int parentId)
25+
public static SiteInitListResult MultipleInitList(int parentId) => new SiteInitListResult
2926
{
30-
return new SiteInitListResult
31-
{
32-
IsAddNewAccessable = false
33-
};
34-
}
27+
IsAddNewAccessable = false
28+
};
3529

36-
public static ListResult<SiteListItem> List(ListCommand cmd, IEnumerable<int> selectedIDs = null)
37-
{
38-
return SiteRepository.GetList(cmd, selectedIDs);
39-
}
30+
public static ListResult<SiteListItem> List(ListCommand cmd, IEnumerable<int> selectedIDs = null) => SiteRepository.GetList(cmd, selectedIDs);
4031

4132
public static IEnumerable<ListItem> GetAllSites()
4233
{
@@ -45,19 +36,13 @@ public static IEnumerable<ListItem> GetAllSites()
4536

4637
public static IEnumerable<ListItem> GetSites()
4738
{
48-
var cmd = new ListCommand() { PageSize = int.MaxValue, StartPage = 1 };
39+
var cmd = new ListCommand { PageSize = int.MaxValue, StartPage = 1 };
4940
return SiteRepository.GetList(cmd, null).Data.Select(s => new ListItem(s.Id.ToString(), s.Name)).ToArray();
5041
}
5142

52-
public static Site Read(int id)
53-
{
54-
return Read(id, true);
55-
}
43+
public static Site Read(int id) => Read(id, true);
5644

57-
public static Site ReadForUpdate(int id)
58-
{
59-
return Read(id, false);
60-
}
45+
public static Site ReadForUpdate(int id) => Read(id, false);
6146

6247
public static Site Save(Site item, int[] activeCommands, int[] activeStyles)
6348
{
@@ -139,24 +124,38 @@ public static MessageResult AssembleContents(int id)
139124
var stageTempDirectory = $@"{site.TempDirectoryForClasses}\stage";
140125

141126
if (Directory.Exists(liveTempDirectory))
127+
{
142128
Directory.Delete(liveTempDirectory, true);
143-
Directory.CreateDirectory(liveTempDirectory);
129+
}
144130

131+
Directory.CreateDirectory(liveTempDirectory);
145132
if (Directory.Exists(stageTempDirectory))
133+
{
146134
Directory.Delete(stageTempDirectory, true);
147-
Directory.CreateDirectory(stageTempDirectory);
135+
}
148136

137+
Directory.CreateDirectory(stageTempDirectory);
149138
if (File.Exists(site.TempArchiveForClasses))
139+
{
150140
File.Delete(site.TempArchiveForClasses);
151-
152-
153-
(new AssembleContentsController(id, sqlMetalPath, QPContext.CurrentDbConnectionString) { SiteRoot = liveTempDirectory, IsLive = true, DisableClassGeneration = site.DownloadEfSource }).Assemble();
154-
(new AssembleContentsController(id, sqlMetalPath, QPContext.CurrentDbConnectionString) { SiteRoot = stageTempDirectory, IsLive = false, DisableClassGeneration = site.DownloadEfSource }).Assemble();
141+
}
142+
143+
new AssembleContentsController(id, sqlMetalPath, QPContext.CurrentDbConnectionString)
144+
{
145+
SiteRoot = liveTempDirectory,
146+
IsLive = true,
147+
DisableClassGeneration = site.DownloadEfSource
148+
}.Assemble();
149+
150+
new AssembleContentsController(id, sqlMetalPath, QPContext.CurrentDbConnectionString)
151+
{
152+
SiteRoot = stageTempDirectory,
153+
IsLive = false,
154+
DisableClassGeneration = site.DownloadEfSource
155+
}.Assemble();
155156

156157
ZipFile.CreateFromDirectory(site.TempDirectoryForClasses, site.TempArchiveForClasses);
157-
158158
return MessageResult.Download($"/Backend/Site/GetClassesZip/{id}");
159-
160159
}
161160

162161
new AssembleContentsController(id, sqlMetalPath, QPContext.CurrentDbConnectionString).Assemble();
@@ -188,15 +187,9 @@ public static void CaptureLock(int id)
188187
}
189188
}
190189

191-
public static Site New()
192-
{
193-
return new Site();
194-
}
190+
public static Site New() => new Site();
195191

196-
public static Site NewForSave()
197-
{
198-
return new Site();
199-
}
192+
public static Site NewForSave() => new Site();
200193

201194
public static LibraryResult Library(int id, string subFolder)
202195
{
@@ -208,7 +201,7 @@ public static LibraryResult Library(int id, string subFolder)
208201
var factory = new SiteFolderFactory();
209202
var repository = factory.CreateRepository();
210203
var folder = repository.GetBySubFolder(id, subFolder);
211-
return new LibraryResult() { Folder = folder };
204+
return new LibraryResult { Folder = folder };
212205
}
213206

214207
public static ListResult<FolderFile> GetFileList(ListCommand command, int parentFolderId, LibraryFileFilter filter)
@@ -224,35 +217,20 @@ public static ListResult<FolderFile> GetFileList(ListCommand command, int parent
224217
return folder.GetFiles(command, filter);
225218
}
226219

227-
public static PathInfo GetPathInfo(int folderId)
228-
{
229-
return SiteFolder.GetPathInfo(folderId);
230-
}
220+
public static PathInfo GetPathInfo(int folderId) => SiteFolder.GetPathInfo(folderId);
231221

232-
internal static IEnumerable<ListItem> GetSites(IEnumerable<int> siteIDs)
233-
{
234-
return SiteRepository.GetSimpleList(siteIDs);
235-
}
222+
internal static IEnumerable<ListItem> GetSites(IEnumerable<int> siteIDs) => SiteRepository.GetSimpleList(siteIDs);
236223

237-
public static IEnumerable<VisualEditorCommand> GetAllVisualEditorCommands()
238-
{
239-
return VisualEditorRepository.GetDefaultCommands();
240-
}
224+
public static IEnumerable<VisualEditorCommand> GetAllVisualEditorCommands() => VisualEditorRepository.GetDefaultCommands();
241225

242226
public static IEnumerable<VisualEditorStyle> GetAllVeStyles()
243227
{
244228
return VisualEditorRepository.GetAllStyles().OrderBy(s => s.Order).ToList();
245229
}
246230

247-
public static Dictionary<int, bool> GetCommandBinding(int siteId)
248-
{
249-
return VisualEditorRepository.GetCommandBindingBySiteId(siteId);
250-
}
231+
public static Dictionary<int, bool> GetCommandBinding(int siteId) => VisualEditorRepository.GetCommandBindingBySiteId(siteId);
251232

252-
public static Dictionary<int, bool> GetStyleBinding(int siteId)
253-
{
254-
return VisualEditorRepository.GetStyleBindingBySiteId(siteId);
255-
}
233+
public static Dictionary<int, bool> GetStyleBinding(int siteId) => VisualEditorRepository.GetStyleBindingBySiteId(siteId);
256234

257235
internal static void CopySiteSettings(int sourceSiteId, int destinationSiteId)
258236
{

siteMvc/Scripts/Quantumart/ActionPermissions/BackendActionPermissionView.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Quantumart.QP8.BackendActionPermissionView.prototype = {
5050
},
5151

5252
dispose() {
53-
Quantumart.QP8.BackendActionPermissionViewManager.getInstance().destroyView();
53+
Quantumart.QP8.BackendActionPermissionViewManager.getInstance().dispose();
5454

5555
if (this._searchBlockComponent) {
5656
this._searchBlockComponent.dispose();

0 commit comments

Comments
 (0)