Skip to content

Commit 40aeeaa

Browse files
committed
correct pagination
naming private varialbes with _ from now on update sequence in postgree after explicit insert Id
1 parent 28f958d commit 40aeeaa

File tree

5 files changed

+31
-2
lines changed

5 files changed

+31
-2
lines changed

Settings.StyleCop

+10
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,16 @@
264264
</Rule>
265265
</Rules>
266266
<AnalyzerSettings />
267+
</Analyzer>
268+
<Analyzer AnalyzerId="StyleCop.CSharp.NamingRules">
269+
<Rules>
270+
<Rule Name="FieldNamesMustNotBeginWithUnderscore">
271+
<RuleSettings>
272+
<BooleanProperty Name="Enabled">False</BooleanProperty>
273+
</RuleSettings>
274+
</Rule>
275+
</Rules>
276+
<AnalyzerSettings />
267277
</Analyzer>
268278
</Analyzers>
269279
</StyleCopSettings>

StaticDate_Postgre.sql

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
INSERT INTO "Core_Role" ("Id", "ConcurrencyStamp", "Name", "NormalizedName") VALUES (1, 'bd3bee0b-5f1d-482d-b890-ffdc01915da3', 'admin', 'ADMIN');
2+
INSERT INTO "Core_Role" ("Id", "ConcurrencyStamp", "Name", "NormalizedName") VALUES (2, 'bd3bee0b-5f1d-482d-b890-ffdc01915da3', 'customer', 'CUSTOMER');
3+
INSERT INTO "Core_Role" ("Id", "ConcurrencyStamp", "Name", "NormalizedName") VALUES (3, 'bd3bee0b-5f1d-482d-b890-ffdc01915da3', 'guest', 'GUEST');
4+
SELECT pg_catalog.setval('"Core_Role_Id_seq"', 3, true);
5+
26

37
INSERT INTO "Core_User" ("Id", "UserGuid", "AccessFailedCount", "ConcurrencyStamp", "CreatedOn", "CurrentShippingAddressId", "Email", "EmailConfirmed", "FullName", "IsDeleted", "LockoutEnabled", "LockoutEnd", "NormalizedEmail", "NormalizedUserName", "PasswordHash", "PhoneNumber", "PhoneNumberConfirmed", "SecurityStamp", "TwoFactorEnabled", "UpdatedOn", "UserName") VALUES (1, '1FFF10CE-0231-43A2-8B7D-C8DB18504F65', 0, '8620916f-e6b6-4f12-9041-83737154b338', '2016-05-20 16:50:05.707655', NULL, '[email protected]', false, 'Shop Admin', false, true, NULL, '[email protected]', '[email protected]', 'AQAAAAEAACcQAAAAEAEqSCV8Bpg69irmeg8N86U503jGEAYf75fBuzvL00/mr/FGEsiUqfR0rWBbBUwqtw==', NULL, false, '9e87ce89-64c0-45b9-8b52-6e0eaa79e5b7', false, '2016-05-20 16:50:05.707655', '[email protected]');
8+
SELECT pg_catalog.setval('"Core_User_Id_seq"', 1, true);
49

510
INSERT INTO "Core_UserRole" ("UserId", "RoleId") VALUES (1, 1);
611

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<StyleCopSettings Version="105">
2+
<Analyzers>
3+
<Analyzer AnalyzerId="StyleCop.CSharp.NamingRules">
4+
<Rules>
5+
<Rule Name="FieldNamesMustNotBeginWithUnderscore">
6+
<RuleSettings>
7+
<BooleanProperty Name="Enabled">False</BooleanProperty>
8+
</RuleSettings>
9+
</Rule>
10+
</Rules>
11+
<AnalyzerSettings />
12+
</Analyzer>
13+
</Analyzers>
14+
</StyleCopSettings>

src/SimplCommerce.Web/wwwroot/admin/app/order/order-list.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
vm.isLoading = true;
1414
orderService.getOrders(tableState).then(function (result) {
1515
vm.orders = result.data.items;
16-
tableState.pagination.totalItemCount = result.data.numberOfPages;
16+
tableState.pagination.numberOfPages = result.data.numberOfPages;
1717
vm.isLoading = false;
1818
});
1919
};

src/SimplCommerce.Web/wwwroot/admin/app/user/user-list.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
vm.isLoading = true;
1414
userService.getUsers(tableState).then(function (result) {
1515
vm.users = result.data.items;
16-
tableState.pagination.totalItemCount = result.data.numberOfPages;
16+
tableState.pagination.numberOfPages = result.data.numberOfPages;
1717
vm.isLoading = false;
1818
});
1919
};

0 commit comments

Comments
 (0)