Upgraded to module zero 0.5.7.0. Also added a sample setting.

aspnetboilerplate · Mar 8, 2015 · 32a4764 · 32a4764
1 parent d28e3f8
commit 32a4764
Show file tree

Hide file tree

Showing 17 changed files with 72 additions and 36 deletions.
diff --git a/sample/ModuleZeroSampleProject.Application/Configuration/MySettingProvider.cs b/sample/ModuleZeroSampleProject.Application/Configuration/MySettingProvider.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using Abp.Configuration;
+
+namespace ModuleZeroSampleProject.Configuration
+{
+    public class MySettingProvider : SettingProvider
+    {
+        public const string QuestionsDefaultPageSize = "QuestionsDefaultPageSize";
+
+        public override IEnumerable<SettingDefinition> GetSettingDefinitions(SettingDefinitionProviderContext context)
+        {
+            return new[]
+                   {
+                       new SettingDefinition(QuestionsDefaultPageSize, "10")
+                   };
+        }
+    }
+}
diff --git a/sample/ModuleZeroSampleProject.Application/ModuleZeroSampleProject.Application.csproj b/sample/ModuleZeroSampleProject.Application/ModuleZeroSampleProject.Application.csproj
@@ -41,9 +41,9 @@
     <Reference Include="Abp.EntityFramework">
       <HintPath>..\packages\Abp.EntityFramework.0.5.5.0\lib\net451\Abp.EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero, Version=0.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Abp.Zero, Version=0.5.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Abp.Zero.0.5.6.0\lib\net451\Abp.Zero.dll</HintPath>
+      <HintPath>..\packages\Abp.Zero.0.5.7.0\lib\net451\Abp.Zero.dll</HintPath>
     </Reference>
     <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -104,6 +104,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Authorization\ModuleZeroSampleProjectAuthorizationProvider.cs" />
+    <Compile Include="Configuration\MySettingProvider.cs" />
     <Compile Include="Questions\Dto\CreateQuestionInput.cs" />
     <Compile Include="Questions\Dto\AnswerDto.cs" />
     <Compile Include="Questions\Dto\GetQuestionsInput.cs" />

diff --git a/sample/ModuleZeroSampleProject.Application/ModuleZeroSampleProjectApplicationModule.cs b/sample/ModuleZeroSampleProject.Application/ModuleZeroSampleProjectApplicationModule.cs
@@ -2,6 +2,7 @@
 using Abp.AutoMapper;
 using Abp.Modules;
 using ModuleZeroSampleProject.Authorization;
+using ModuleZeroSampleProject.Configuration;
 
 namespace ModuleZeroSampleProject
 {
@@ -12,6 +13,7 @@ public override void Initialize()
         {
             IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());
             Configuration.Authorization.Providers.Add<ModuleZeroSampleProjectAuthorizationProvider>();
+            Configuration.Settings.Providers.Add<MySettingProvider>();
         }
     }
 }
diff --git a/sample/ModuleZeroSampleProject.Application/Questions/Dto/GetQuestionsInput.cs b/sample/ModuleZeroSampleProject.Application/Questions/Dto/GetQuestionsInput.cs
@@ -8,18 +8,13 @@ namespace ModuleZeroSampleProject.Questions.Dto
 {
     public class GetQuestionsInput : IInputDto, IPagedResultRequest, ISortedResultRequest, ICustomValidate
     {
-        [Range(1, 1000)]
+        [Range(0, 1000)]
         public int MaxResultCount { get; set; }
 
         public int SkipCount { get; set; }
 
         public string Sorting { get; set; }
-
-        public GetQuestionsInput()
-        {
-            MaxResultCount = 10;
-        }
-
+
         public void AddValidationErrors(List<ValidationResult> results)
         {
             var validSortingValues = new[] { "CreationTime DESC", "VoteCount DESC", "ViewCount DESC", "AnswerCount DESC" };

diff --git a/sample/ModuleZeroSampleProject.Application/Questions/QuestionAppService.cs b/sample/ModuleZeroSampleProject.Application/Questions/QuestionAppService.cs
@@ -7,10 +7,13 @@
 using Abp.Application.Services.Dto;
 using Abp.Authorization;
 using Abp.AutoMapper;
+using Abp.Configuration;
 using Abp.Domain.Repositories;
 using Abp.Domain.Uow;
 using Abp.Linq.Extensions;
+using Abp.Runtime.Session;
 using Abp.UI;
+using ModuleZeroSampleProject.Configuration;
 using ModuleZeroSampleProject.Questions.Dto;
 using ModuleZeroSampleProject.Users;
 
@@ -36,6 +39,11 @@ public QuestionAppService(IRepository<Question> questionRepository, IRepository<
 
         public PagedResultOutput<QuestionDto> GetQuestions(GetQuestionsInput input)
         {
+            if (input.MaxResultCount <= 0)
+            {
+                input.MaxResultCount = SettingManager.GetSettingValue<int>(MySettingProvider.QuestionsDefaultPageSize);
+            }
+
             var questionCount = _questionRepository.Count();
             var questions =
                 _questionRepository
@@ -102,7 +110,7 @@ public VoteChangeOutput VoteDown(EntityRequestInput input)
         public SubmitAnswerOutput SubmitAnswer(SubmitAnswerInput input)
         {
             var question = _questionRepository.Get(input.QuestionId);
-            var currentUser = _userRepository.Get(CurrentSession.UserId.Value);
+            var currentUser = _userRepository.Get(CurrentSession.GetUserId());
 
             question.AnswerCount++;
 

diff --git a/sample/ModuleZeroSampleProject.Application/packages.config b/sample/ModuleZeroSampleProject.Application/packages.config
@@ -3,7 +3,7 @@
   <package id="Abp" version="0.5.5.0" targetFramework="net451" />
   <package id="Abp.AutoMapper" version="0.5.5.0" targetFramework="net451" />
   <package id="Abp.EntityFramework" version="0.5.5.0" targetFramework="net451" />
-  <package id="Abp.Zero" version="0.5.6.0" targetFramework="net451" />
+  <package id="Abp.Zero" version="0.5.7.0" targetFramework="net451" />
   <package id="AutoMapper" version="3.3.1" targetFramework="net451" />
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
   <package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />

diff --git a/sample/ModuleZeroSampleProject.Core/ModuleZeroSampleProject.Core.csproj b/sample/ModuleZeroSampleProject.Core/ModuleZeroSampleProject.Core.csproj
@@ -35,9 +35,9 @@
     <Reference Include="Abp">
       <HintPath>..\packages\Abp.0.5.5.0\lib\net451\Abp.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero, Version=0.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Abp.Zero, Version=0.5.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Abp.Zero.0.5.6.0\lib\net451\Abp.Zero.dll</HintPath>
+      <HintPath>..\packages\Abp.Zero.0.5.7.0\lib\net451\Abp.Zero.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/sample/ModuleZeroSampleProject.Core/Users/UserManager.cs b/sample/ModuleZeroSampleProject.Core/Users/UserManager.cs
@@ -1,4 +1,5 @@
-using Abp.Authorization.Users;
+using Abp.Authorization;
+using Abp.Authorization.Users;
 using Abp.Domain.Repositories;
 using Abp.Zero.Configuration;
 using ModuleZeroSampleProject.Authorization;
@@ -8,8 +9,18 @@ namespace ModuleZeroSampleProject.Users
 {
     public class UserManager : AbpUserManager<Tenant, Role, User>
     {
-        public UserManager(UserStore store, RoleManager roleManager, IRepository<Tenant> tenantRepository, MultiTenancyConfig multiTenancyConfig)
-            : base(store, roleManager, tenantRepository, multiTenancyConfig)
+        public UserManager(
+            UserStore store,
+            RoleManager roleManager,
+            IRepository<Tenant> tenantRepository,
+            MultiTenancyConfig multiTenancyConfig,
+            IPermissionManager permissionManager)
+            : base(
+                store,
+                roleManager,
+                tenantRepository,
+                multiTenancyConfig, 
+                permissionManager)
         {
         }
     }

diff --git a/sample/ModuleZeroSampleProject.Core/Users/UserStore.cs b/sample/ModuleZeroSampleProject.Core/Users/UserStore.cs
@@ -13,12 +13,14 @@ public UserStore(
             IRepository<UserLogin, long> userLoginRepository,
             IRepository<UserRole, long> userRoleRepository,
             IRepository<Role> roleRepository,
+            IRepository<UserPermissionSetting, long> userPermissionSettingRepository,
             IAbpSession session)
             : base(
                 userRepository,
                 userLoginRepository,
                 userRoleRepository,
                 roleRepository,
+                userPermissionSettingRepository,
                 session)
         {
         }

diff --git a/sample/ModuleZeroSampleProject.Core/packages.config b/sample/ModuleZeroSampleProject.Core/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Abp" version="0.5.5.0" targetFramework="net451" />
-  <package id="Abp.Zero" version="0.5.6.0" targetFramework="net451" />
+  <package id="Abp.Zero" version="0.5.7.0" targetFramework="net451" />
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
   <package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
   <package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />

diff --git a/...le/ModuleZeroSampleProject.EntityFramework/ModuleZeroSampleProject.EntityFramework.csproj b/...le/ModuleZeroSampleProject.EntityFramework/ModuleZeroSampleProject.EntityFramework.csproj
@@ -38,13 +38,13 @@
     <Reference Include="Abp.EntityFramework">
       <HintPath>..\packages\Abp.EntityFramework.0.5.5.0\lib\net451\Abp.EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero, Version=0.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Abp.Zero, Version=0.5.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Abp.Zero.0.5.6.0\lib\net451\Abp.Zero.dll</HintPath>
+      <HintPath>..\packages\Abp.Zero.0.5.7.0\lib\net451\Abp.Zero.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero.EntityFramework, Version=0.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Abp.Zero.EntityFramework, Version=0.5.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Abp.Zero.EntityFramework.0.5.6.0\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
+      <HintPath>..\packages\Abp.Zero.EntityFramework.0.5.7.0\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/sample/ModuleZeroSampleProject.EntityFramework/packages.config b/sample/ModuleZeroSampleProject.EntityFramework/packages.config
@@ -2,8 +2,8 @@
 <packages>
   <package id="Abp" version="0.5.5.0" targetFramework="net451" />
   <package id="Abp.EntityFramework" version="0.5.5.0" targetFramework="net451" />
-  <package id="Abp.Zero" version="0.5.6.0" targetFramework="net451" />
-  <package id="Abp.Zero.EntityFramework" version="0.5.6.0" targetFramework="net451" />
+  <package id="Abp.Zero" version="0.5.7.0" targetFramework="net451" />
+  <package id="Abp.Zero.EntityFramework" version="0.5.7.0" targetFramework="net451" />
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
   <package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
   <package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />

diff --git a/sample/ModuleZeroSampleProject.Web/App/Main/views/questions/index.js b/sample/ModuleZeroSampleProject.Web/App/Main/views/questions/index.js
@@ -20,7 +20,6 @@
                 abp.ui.setBusy(
                     null,
                     questionService.getQuestions({
-                        maxResultCount: 10,
                         skipCount: skipCount,
                         sorting: vm.sorting
                     }).success(function (data) {

diff --git a/sample/ModuleZeroSampleProject.Web/ModuleZeroSampleProject.Web.csproj b/sample/ModuleZeroSampleProject.Web/ModuleZeroSampleProject.Web.csproj
@@ -57,13 +57,13 @@
     <Reference Include="Abp.Web.Mvc">
       <HintPath>..\packages\Abp.Web.Mvc.0.5.5.0\lib\net451\Abp.Web.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero, Version=0.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Abp.Zero, Version=0.5.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Abp.Zero.0.5.6.0\lib\net451\Abp.Zero.dll</HintPath>
+      <HintPath>..\packages\Abp.Zero.0.5.7.0\lib\net451\Abp.Zero.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero.EntityFramework, Version=0.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Abp.Zero.EntityFramework, Version=0.5.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Abp.Zero.EntityFramework.0.5.6.0\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
+      <HintPath>..\packages\Abp.Zero.EntityFramework.0.5.7.0\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="Antlr3.Runtime">
       <HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>

diff --git a/sample/ModuleZeroSampleProject.Web/packages.config b/sample/ModuleZeroSampleProject.Web/packages.config
@@ -6,8 +6,8 @@
   <package id="Abp.Web.Api" version="0.5.5.0" targetFramework="net451" />
   <package id="Abp.Web.Mvc" version="0.5.5.0" targetFramework="net451" />
   <package id="Abp.Web.Resources" version="0.5.5.0" targetFramework="net451" />
-  <package id="Abp.Zero" version="0.5.6.0" targetFramework="net451" />
-  <package id="Abp.Zero.EntityFramework" version="0.5.6.0" targetFramework="net451" />
+  <package id="Abp.Zero" version="0.5.7.0" targetFramework="net451" />
+  <package id="Abp.Zero.EntityFramework" version="0.5.7.0" targetFramework="net451" />
   <package id="Angular.UI.Bootstrap" version="0.12.0" targetFramework="net451" />
   <package id="Angular.UI.Utils" version="0.1.1" targetFramework="net451" />
   <package id="Antlr" version="3.5.0.2" targetFramework="net451" />

diff --git a/sample/Tests/ModuleZeroSampleProject.Tests/ModuleZeroSampleProject.Tests.csproj b/sample/Tests/ModuleZeroSampleProject.Tests/ModuleZeroSampleProject.Tests.csproj
@@ -43,13 +43,13 @@
     <Reference Include="Abp.TestBase">
       <HintPath>..\..\packages\Abp.TestBase.0.1.3.0\lib\net451\Abp.TestBase.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero, Version=0.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Abp.Zero, Version=0.5.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Abp.Zero.0.5.6.0\lib\net451\Abp.Zero.dll</HintPath>
+      <HintPath>..\..\packages\Abp.Zero.0.5.7.0\lib\net451\Abp.Zero.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Zero.EntityFramework, Version=0.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Abp.Zero.EntityFramework, Version=0.5.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Abp.Zero.EntityFramework.0.5.6.0\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
+      <HintPath>..\..\packages\Abp.Zero.EntityFramework.0.5.7.0\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core">
       <HintPath>..\..\packages\Castle.Core.3.3.0\lib\net45\Castle.Core.dll</HintPath>

diff --git a/sample/Tests/ModuleZeroSampleProject.Tests/packages.config b/sample/Tests/ModuleZeroSampleProject.Tests/packages.config
@@ -3,8 +3,8 @@
   <package id="Abp" version="0.5.5.0" targetFramework="net451" />
   <package id="Abp.EntityFramework" version="0.5.5.0" targetFramework="net451" />
   <package id="Abp.TestBase" version="0.1.3.0" targetFramework="net451" />
-  <package id="Abp.Zero" version="0.5.6.0" targetFramework="net451" />
-  <package id="Abp.Zero.EntityFramework" version="0.5.6.0" targetFramework="net451" />
+  <package id="Abp.Zero" version="0.5.7.0" targetFramework="net451" />
+  <package id="Abp.Zero.EntityFramework" version="0.5.7.0" targetFramework="net451" />
   <package id="Castle.Core" version="3.3.0" targetFramework="net451" />
   <package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
   <package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />