Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
998076d0
Commit
998076d0
authored
Oct 20, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #5665: The `currentPage` meta data in the RESTful result should be…
Fixes #5665: The `currentPage` meta data in the RESTful result should be 1-based, similar to that in HTTP headers
parent
16630a02
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
Serializer.php
framework/rest/Serializer.php
+1
-1
No files found.
framework/CHANGELOG.md
View file @
998076d0
...
@@ -8,6 +8,7 @@ Yii Framework 2 Change Log
...
@@ -8,6 +8,7 @@ Yii Framework 2 Change Log
-
Bug #5402: Debugger was not loading when there were closures in asset classes (samdark)
-
Bug #5402: Debugger was not loading when there were closures in asset classes (samdark)
-
Bug #5584:
`yii\rbac\DbRbacManager`
should not delete items when deleting a rule on a database not supporting cascade update (mdmunir)
-
Bug #5584:
`yii\rbac\DbRbacManager`
should not delete items when deleting a rule on a database not supporting cascade update (mdmunir)
-
Bug #5601: Simple conditions in Query::where() and ActiveQuery::where() did not allow
`yii\db\Expression`
to be used as the value (cebe, stevekr)
-
Bug #5601: Simple conditions in Query::where() and ActiveQuery::where() did not allow
`yii\db\Expression`
to be used as the value (cebe, stevekr)
-
Bug #5665: The
`currentPage`
meta data in the RESTful result should be 1-based, similar to that in HTTP headers (qiangxue)
-
Bug: Gii console command help information does not contain global options (qiangxue)
-
Bug: Gii console command help information does not contain global options (qiangxue)
-
Enh #5223: Query builder now supports selecting sub-queries as columns (qiangxue)
-
Enh #5223: Query builder now supports selecting sub-queries as columns (qiangxue)
-
Enh #5587:
`json_encode`
is now used with
`JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE`
where it makes sense, also
-
Enh #5587:
`json_encode`
is now used with
`JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE`
where it makes sense, also
...
...
framework/rest/Serializer.php
View file @
998076d0
...
@@ -194,7 +194,7 @@ class Serializer extends Component
...
@@ -194,7 +194,7 @@ class Serializer extends Component
'_meta'
=>
[
'_meta'
=>
[
'totalCount'
=>
$pagination
->
totalCount
,
'totalCount'
=>
$pagination
->
totalCount
,
'pageCount'
=>
$pagination
->
getPageCount
(),
'pageCount'
=>
$pagination
->
getPageCount
(),
'currentPage'
=>
$pagination
->
getPage
(),
'currentPage'
=>
$pagination
->
getPage
()
+
1
,
'perPage'
=>
$pagination
->
getPageSize
(),
'perPage'
=>
$pagination
->
getPageSize
(),
],
],
];
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment