Browse Source

Merge branch 'dev' of https://github.com/abpframework/abp into dev

pull/2018/head
mehmet-erim 7 years ago
parent
commit
f352c51104
  1. 7
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs
  2. 1
      npm/ng-packs/packages/setting-management-config/src/lib/services/setting-management-config.service.ts
  3. 4
      npm/ng-packs/packages/setting-management/src/lib/setting-management-routing.module.ts

7
modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs

@ -233,6 +233,13 @@ namespace Volo.Docs.Pages.Documents.Project
}
}
}
else
{
LatestVersionInfo = new VersionInfoViewModel(
$"{DocsAppConsts.Latest}",
DocsAppConsts.Latest,
true);
}
VersionSelectItems = versions.Select(v => new SelectListItem
{

1
npm/ng-packs/packages/setting-management-config/src/lib/services/setting-management-config.service.ts

@ -12,6 +12,7 @@ export class SettingManagementConfigService {
name: 'AbpSettingManagement::Settings',
path: 'setting-management',
parentName: 'AbpUiNavigation::Menu:Administration',
requiredPolicy: 'AbpAccount.SettingManagement',
layout: eLayoutType.application,
order: 6,
iconClass: 'fa fa-cog',

4
npm/ng-packs/packages/setting-management/src/lib/setting-management-routing.module.ts

@ -7,7 +7,9 @@ const routes: Routes = [
{
path: '',
component: DynamicLayoutComponent,
children: [{ path: '', component: SettingManagementComponent }],
children: [
{ path: '', component: SettingManagementComponent, data: { requiredPolicy: 'AbpAccount.SettingManagement' } },
],
},
];

Loading…
Cancel
Save