Skip to content

Commit a525968

Browse files
committed
upgraded to latest abp
1 parent df949d1 commit a525968

21 files changed

+24
-8
lines changed

Abp/Framework/scripts/abp.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
let isEnabled: boolean;
2020

21+
let ignoreFeatureCheckForHostUsers: boolean;
22+
2123
let tenantIdCookieName: string;
2224

2325
function setTenantIdCookie(tenantId?: number): void;

Abp/Framework/scripts/abp.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
abp.multiTenancy = abp.multiTenancy || {};
2222

2323
abp.multiTenancy.isEnabled = false;
24+
abp.multiTenancy.ignoreFeatureCheckForHostUsers = false;
2425

2526
abp.multiTenancy.sides = {
2627
TENANT: 1,

Abp/Framework/scripts/abp.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Abp/Framework/scripts/libs/abp.blockUI.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Abp/Framework/scripts/libs/abp.jquery.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Abp/Framework/scripts/libs/abp.jtable.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
.done(function (result) {
5555
$dfd.resolve({
5656
"Result": "OK",
57-
"Records": result.items || result[originalListAction.recordsField],
58-
"TotalRecordCount": result.totalCount,
57+
"Records": result.items || result[originalListAction.recordsField] || result,
58+
"TotalRecordCount": result.totalCount || result.length,
5959
originalResult: result
6060
});
6161
})
@@ -169,4 +169,4 @@
169169
pageList: "minimal"
170170
});
171171

172-
})(jQuery);
172+
})(jQuery);

Abp/Framework/scripts/libs/abp.jtable.min.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)