Browse Source

Merge branch 'dev' into pr/10376

pull/10376/head
maliming 5 years ago
parent
commit
b457ca37c0
No known key found for this signature in database GPG Key ID: 96224957E51C89E
  1. 4
      codecov.yml
  2. 2
      common.props
  3. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/AlertsDemo/AlertsDemoViewComponent.cs
  4. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BadgesDemo/BadgesDemoViewComponent.cs
  5. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BordersDemo/BordersDemoViewComponent.cs
  6. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BreadcrumbsDemo/BreadcrumbsDemoViewComponent.cs
  7. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonGroupsDemo/ButtonGroupsDemoViewComponent.cs
  8. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/ButtonsDemoViewComponent.cs
  9. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/CardsDemoViewComponent.cs
  10. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CarouselDemo/CarouselDemoViewComponent.cs
  11. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CollapseDemo/CollapseDemoViewComponent.cs
  12. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/DropdownsDemoViewComponent.cs
  13. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs
  14. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs
  15. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/GridsDemo/GridsDemoViewComponent.cs
  16. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/ListGroupsDemoViewComponent.cs
  17. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ModalsDemo/ModalsDemoViewComponent.cs
  18. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs
  19. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/NavsDemoViewComponent.cs
  20. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/PopoversDemoViewComponent.cs
  21. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ProgressBarsDemo/ProgressBarsDemoViewComponent.cs
  22. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TablesDemo/TablesDemoViewComponent.cs
  23. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TabsDemo/TabsDemoViewComponent.cs
  24. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TooltipsDemo/TooltipsDemoViewComponent.cs
  25. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpApplicationPath/AbpApplicationPathViewComponent.cs
  26. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs
  27. 6
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/AbpPageToolbarViewComponent.cs
  28. 8
      modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/AccountProfilePasswordManagementGroupViewComponent.cs
  29. 8
      modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/PersonalInfo/AccountProfilePersonalInfoManagementGroupViewComponent.cs
  30. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Brand/MainNavbarBrandViewComponent.cs
  31. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/MainNavbar/MainNavbarViewComponent.cs
  32. 8
      modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/MainNavbarMenuViewComponent.cs
  33. 6
      modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/PageAlerts/PageAlertsViewComponent.cs
  34. 8
      modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/LanguageSwitchViewComponent.cs
  35. 8
      modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/MainNavbarToolbarViewComponent.cs
  36. 8
      modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/UserMenuViewComponent.cs
  37. 1
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js
  38. 1
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
  39. 1
      modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/PermissionStore_Tests.cs
  40. 8
      modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/EmailSettingGroupViewComponent.cs
  41. 5
      npm/packs/aspnetcore.mvc.ui.theme.basic/package.json
  42. 5
      npm/packs/aspnetcore.mvc.ui.theme.shared/package.json
  43. 5
      npm/packs/aspnetcore.mvc.ui/package.json
  44. 5
      npm/packs/bootstrap-datepicker/package.json
  45. 5
      npm/packs/bootstrap/package.json
  46. 5
      npm/packs/core/package.json
  47. 5
      npm/packs/datatables.net-bs4/package.json
  48. 5
      npm/packs/datatables.net/package.json
  49. 5
      npm/packs/font-awesome/package.json
  50. 5
      npm/packs/jquery-form/package.json
  51. 5
      npm/packs/jquery-validation-unobtrusive/package.json
  52. 5
      npm/packs/jquery-validation/package.json
  53. 5
      npm/packs/jquery/package.json
  54. 5
      npm/packs/lodash/package.json
  55. 5
      npm/packs/luxon/package.json
  56. 5
      npm/packs/malihu-custom-scrollbar-plugin/package.json
  57. 5
      npm/packs/select2/package.json
  58. 4
      npm/packs/select2/src/select2-bootstrap-modal-patch.js
  59. 5
      npm/packs/sweetalert2/package.json
  60. 5
      npm/packs/timeago/package.json
  61. 5
      npm/packs/toastr/package.json
  62. 5
      npm/packs/utils/package.json

4
codecov.yml

@ -1,6 +1,4 @@
codecov:
branch: dev
require_ci_to_pass: yes
comment:
require_head: no
require_base: no
allow_coverage_offsets: true

2
common.props

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>5.0.0-beta.1</Version>
<Version>5.0.0-beta.2</Version>
<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
<PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
<PackageProjectUrl>https://abp.io/</PackageProjectUrl>

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/AlertsDemo/AlertsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/AlertsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BadgesDemo/BadgesDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/BadgesDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BordersDemo/BordersDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/BordersDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/BreadcrumbsDemo/BreadcrumbsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/BreadcrumbsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonGroupsDemo/ButtonGroupsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ButtonGroupsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ButtonsDemo/ButtonsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ButtonsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CardsDemo/CardsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/CardsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CarouselDemo/CarouselDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/CarouselDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/CollapseDemo/CollapseDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/CollapseDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DropdownsDemo/DropdownsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/DropdownsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
var Model = new DropDownDemoDemoModel();

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/DynamicFormsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/DynamicFormsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
var model = new DynamicFormsDemoModel();

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/FormElementsDemo/FormElementsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/FormElementsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
var model = new FormElementsDemoModel();

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/GridsDemo/GridsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/GridsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ListGroupsDemo/ListGroupsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ListGroupsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ModalsDemo/ModalsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ModalsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavbarsDemo/NavbarsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/NavbarsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/NavsDemo/NavsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/NavsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/PopoversDemo/PopoversDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/PopoversDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/ProgressBarsDemo/ProgressBarsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/ProgressBarsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TablesDemo/TablesDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/TablesDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TabsDemo/TabsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/TabsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Views/Components/Themes/Shared/Demos/TooltipsDemo/TooltipsDemoViewComponent.cs

@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.Views.Components.Themes.S
{
public const string ViewPath = "/Views/Components/Themes/Shared/Demos/TooltipsDemo/Default.cshtml";
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View(ViewPath);
}

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpApplicationPath/AbpApplicationPathViewComponent.cs

@ -5,7 +5,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpApp
{
public class AbpApplicationPathViewComponent : AbpViewComponent
{
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
var applicationPath = ViewContext.HttpContext.Request.PathBase.Value;
var model = new AbpApplicationPathViewComponentModel

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageSearchBox/AbpPageSearchBoxViewComponent.cs

@ -4,7 +4,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPag
{
public class AbpPageSearchBoxViewComponent : AbpViewComponent
{
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View("~/Pages/Shared/Components/AbpPageSearchBox/Default.cshtml");
}

6
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Pages/Shared/Components/AbpPageToolbar/AbpPageToolbarViewComponent.cs

@ -6,16 +6,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Pages.Shared.Components.AbpPag
{
public class AbpPageToolbarViewComponent : AbpViewComponent
{
private readonly IPageToolbarManager _toolbarManager;
protected IPageToolbarManager ToolbarManager { get; }
public AbpPageToolbarViewComponent(IPageToolbarManager toolbarManager)
{
_toolbarManager = toolbarManager;
ToolbarManager = toolbarManager;
}
public async Task<IViewComponentResult> InvokeAsync(string pageName)
{
var items = await _toolbarManager.GetItemsAsync(pageName);
var items = await ToolbarManager.GetItemsAsync(pageName);
return View("~/Pages/Shared/Components/AbpPageToolbar/Default.cshtml", items);
}
}

8
modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/Password/AccountProfilePasswordManagementGroupViewComponent.cs

@ -11,17 +11,17 @@ namespace Volo.Abp.Account.Web.Pages.Account.Components.ProfileManagementGroup.P
{
public class AccountProfilePasswordManagementGroupViewComponent : AbpViewComponent
{
private readonly IProfileAppService _profileAppService;
protected IProfileAppService ProfileAppService { get; }
public AccountProfilePasswordManagementGroupViewComponent(
IProfileAppService profileAppService)
{
_profileAppService = profileAppService;
ProfileAppService = profileAppService;
}
public async Task<IViewComponentResult> InvokeAsync()
public virtual async Task<IViewComponentResult> InvokeAsync()
{
var user = await _profileAppService.GetAsync();
var user = await ProfileAppService.GetAsync();
var model = new ChangePasswordInfoModel
{

8
modules/account/src/Volo.Abp.Account.Web/Pages/Account/Components/ProfileManagementGroup/PersonalInfo/AccountProfilePersonalInfoManagementGroupViewComponent.cs

@ -11,19 +11,19 @@ namespace Volo.Abp.Account.Web.Pages.Account.Components.ProfileManagementGroup.P
{
public class AccountProfilePersonalInfoManagementGroupViewComponent : AbpViewComponent
{
private readonly IProfileAppService _profileAppService;
protected IProfileAppService ProfileAppService { get; }
public AccountProfilePersonalInfoManagementGroupViewComponent(
IProfileAppService profileAppService)
{
_profileAppService = profileAppService;
ProfileAppService = profileAppService;
ObjectMapperContext = typeof(AbpAccountWebModule);
}
public async Task<IViewComponentResult> InvokeAsync()
public virtual async Task<IViewComponentResult> InvokeAsync()
{
var user = await _profileAppService.GetAsync();
var user = await ProfileAppService.GetAsync();
var model = ObjectMapper.Map<ProfileDto, PersonalInfoModel>(user);

2
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Brand/MainNavbarBrandViewComponent.cs

@ -4,7 +4,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Brand
{
public class MainNavbarBrandViewComponent : AbpViewComponent
{
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View("~/Themes/Basic/Components/Brand/Default.cshtml");
}

2
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/MainNavbar/MainNavbarViewComponent.cs

@ -4,7 +4,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.MainNav
{
public class MainNavbarViewComponent : AbpViewComponent
{
public IViewComponentResult Invoke()
public virtual IViewComponentResult Invoke()
{
return View("~/Themes/Basic/Components/MainNavbar/Default.cshtml");
}

8
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Menu/MainNavbarMenuViewComponent.cs

@ -6,16 +6,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Menu
{
public class MainNavbarMenuViewComponent : AbpViewComponent
{
private readonly IMenuManager _menuManager;
protected IMenuManager MenuManager { get; }
public MainNavbarMenuViewComponent(IMenuManager menuManager)
{
_menuManager = menuManager;
MenuManager = menuManager;
}
public async Task<IViewComponentResult> InvokeAsync()
public async virtual Task<IViewComponentResult> InvokeAsync()
{
var menu = await _menuManager.GetMainMenuAsync();
var menu = await MenuManager.GetMainMenuAsync();
return View("~/Themes/Basic/Components/Menu/Default.cshtml", menu);
}
}

6
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/PageAlerts/PageAlertsViewComponent.cs

@ -5,16 +5,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.PageAle
{
public class PageAlertsViewComponent : AbpViewComponent
{
private readonly IAlertManager _alertManager;
protected IAlertManager AlertManager { get; }
public PageAlertsViewComponent(IAlertManager alertManager)
{
_alertManager = alertManager;
AlertManager = alertManager;
}
public IViewComponentResult Invoke(string name)
{
return View("~/Themes/Basic/Components/PageAlerts/Default.cshtml", _alertManager.Alerts);
return View("~/Themes/Basic/Components/PageAlerts/Default.cshtml", AlertManager.Alerts);
}
}
}

8
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/LanguageSwitch/LanguageSwitchViewComponent.cs

@ -10,16 +10,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar
{
public class LanguageSwitchViewComponent : AbpViewComponent
{
private readonly ILanguageProvider _languageProvider;
protected ILanguageProvider LanguageProvider { get; }
public LanguageSwitchViewComponent(ILanguageProvider languageProvider)
{
_languageProvider = languageProvider;
LanguageProvider = languageProvider;
}
public async Task<IViewComponentResult> InvokeAsync()
public async virtual Task<IViewComponentResult> InvokeAsync()
{
var languages = await _languageProvider.GetLanguagesAsync();
var languages = await LanguageProvider.GetLanguagesAsync();
var currentLanguage = languages.FindByCulture(
CultureInfo.CurrentCulture.Name,
CultureInfo.CurrentUICulture.Name

8
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/MainNavbarToolbarViewComponent.cs

@ -6,16 +6,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar
{
public class MainNavbarToolbarViewComponent : AbpViewComponent
{
private readonly IToolbarManager _toolbarManager;
protected IToolbarManager ToolbarManager { get; }
public MainNavbarToolbarViewComponent(IToolbarManager toolbarManager)
{
_toolbarManager = toolbarManager;
ToolbarManager = toolbarManager;
}
public async Task<IViewComponentResult> InvokeAsync()
public async virtual Task<IViewComponentResult> InvokeAsync()
{
var toolbar = await _toolbarManager.GetAsync(StandardToolbars.Main);
var toolbar = await ToolbarManager.GetAsync(StandardToolbars.Main);
return View("~/Themes/Basic/Components/Toolbar/Default.cshtml", toolbar);
}
}

8
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Components/Toolbar/UserMenu/UserMenuViewComponent.cs

@ -6,16 +6,16 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Themes.Basic.Components.Toolbar
{
public class UserMenuViewComponent : AbpViewComponent
{
private readonly IMenuManager _menuManager;
protected IMenuManager MenuManager { get; }
public UserMenuViewComponent(IMenuManager menuManager)
{
_menuManager = menuManager;
MenuManager = menuManager;
}
public async Task<IViewComponentResult> InvokeAsync()
public async virtual Task<IViewComponentResult> InvokeAsync()
{
var menu = await _menuManager.GetAsync(StandardMenus.User);
var menu = await MenuManager.GetAsync(StandardMenus.User);
return View("~/Themes/Basic/Components/Toolbar/UserMenu/Default.cshtml", menu);
}
}

1
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js

@ -10,6 +10,7 @@ $(function (){
todayBtn: "linked",
autoclose: true,
language: abp.localization.currentCulture.cultureName,
format: abp.localization.currentCulture.dateTimeFormat.shortDatePattern
})
.on("hide", function (e) {
e.stopPropagation();

1
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js

@ -10,6 +10,7 @@ $(function (){
todayBtn: "linked",
autoclose: true,
language: abp.localization.currentCulture.cultureName,
format: abp.localization.currentCulture.dateTimeFormat.shortDatePattern
})
.on("hide", function (e) {
e.stopPropagation();

1
modules/permission-management/test/Volo.Abp.PermissionManagement.Domain.Tests/Volo/Abp/PermissionManagement/PermissionStore_Tests.cs

@ -22,7 +22,6 @@ namespace Volo.Abp.PermissionManagement
UserPermissionValueProvider.ProviderName,
PermissionTestDataBuilder.User1Id.ToString())).ShouldBeTrue();
(await _permissionStore.IsGrantedAsync("MyPermission1NotExist",
UserPermissionValueProvider.ProviderName,
PermissionTestDataBuilder.User1Id.ToString())).ShouldBeFalse();

8
modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/EmailSettingGroupViewComponent.cs

@ -6,17 +6,17 @@ namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement.Components.Emai
{
public class EmailSettingGroupViewComponent : AbpViewComponent
{
private readonly IEmailSettingsAppService _emailSettingsAppService;
protected IEmailSettingsAppService EmailSettingsAppService { get; }
public EmailSettingGroupViewComponent(IEmailSettingsAppService emailSettingsAppService)
{
ObjectMapperContext = typeof(AbpSettingManagementWebModule);
_emailSettingsAppService = emailSettingsAppService;
EmailSettingsAppService = emailSettingsAppService;
}
public async Task<IViewComponentResult> InvokeAsync()
public async virtual Task<IViewComponentResult> InvokeAsync()
{
var model = await _emailSettingsAppService.GetAsync();
var model = await EmailSettingsAppService.GetAsync();
return View("~/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml", model);
}

5
npm/packs/aspnetcore.mvc.ui.theme.basic/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/aspnetcore.mvc.ui.theme.basic",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/aspnetcore.mvc.ui.theme.basic"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/aspnetcore.mvc.ui.theme.shared/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/aspnetcore.mvc.ui.theme.shared",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/aspnetcore.mvc.ui.theme.shared"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/aspnetcore.mvc.ui/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/aspnetcore.mvc.ui",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/aspnetcore.mvc.ui"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/bootstrap-datepicker/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/bootstrap-datepicker",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/bootstrap-datepicker"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/bootstrap/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/bootstrap",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/bootstrap"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/core/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/core",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/core"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/datatables.net-bs4/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/datatables.net-bs4",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/datatables.net-bs4"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/datatables.net/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/datatables.net",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/datatables.net"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/font-awesome/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/font-awesome",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/font-awesome"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/jquery-form/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/jquery-form",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/jquery-form"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/jquery-validation-unobtrusive/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/jquery-validation-unobtrusive",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/jquery-validation-unobtrusive"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/jquery-validation/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/jquery-validation",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/jquery-validation"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/jquery/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/jquery",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/jquery"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/lodash/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/lodash",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/lodash"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/luxon/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/luxon",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/luxon"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/malihu-custom-scrollbar-plugin/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/malihu-custom-scrollbar-plugin",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/malihu-custom-scrollbar-plugin"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/select2/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/select2",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/select2"
},
"publishConfig": {
"access": "public"
},

4
npm/packs/select2/src/select2-bootstrap-modal-patch.js

@ -1,4 +1,6 @@
/*
https://select2.org/troubleshooting/common-problems
*/
$.fn.modal.Constructor.prototype._enforceFocus = function () { };
if ($.fn.modal) {
$.fn.modal.Constructor.prototype._enforceFocus = function () { };
}

5
npm/packs/sweetalert2/package.json

@ -4,6 +4,11 @@
"publishConfig": {
"access": "public"
},
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory":"npm/packs/sweetalert2"
},
"dependencies": {
"@abp/core": "~5.0.0-beta.1",
"sweetalert2": "^11.0.18"

5
npm/packs/timeago/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/timeago",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/timeago"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/toastr/package.json

@ -1,6 +1,11 @@
{
"version": "5.0.0-beta.1",
"name": "@abp/toastr",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/toastr"
},
"publishConfig": {
"access": "public"
},

5
npm/packs/utils/package.json

@ -13,6 +13,11 @@
"access": "public"
},
"main": "dist/bundles/abp-utils.umd.js",
"repository": {
"type": "git",
"url": "https://github.com/abpframework/abp.git",
"directory": "npm/packs/utils"
},
"module": "dist/fesm2015/abp-utils.js",
"es2015_ivy_ngcc": "__ivy_ngcc__/dist/fesm2015/abp-utils.js",
"es2015": "dist/fesm2015/abp-utils.js",

Loading…
Cancel
Save