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
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Rotua Panjaitan
yii2
Commits
33727859
Commit
33727859
authored
May 24, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3544 from MDMunir/patch-1
Add $key to function parameter
parents
11826547
ff4307be
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
DataColumn.php
framework/grid/DataColumn.php
+2
-2
No files found.
framework/CHANGELOG.md
View file @
33727859
...
...
@@ -77,6 +77,7 @@ Yii Framework 2 Change Log
-
Chg:
`yii\data\ActiveDataProvider::$query`
will not be modified directly with pagination and sorting anymore so it will be reuseable (cebe)
-
Chg: Removed
`yii\rest\ActiveController::$transactional`
property and connected functionality (samdark)
-
Chg: Changed the default value of the
`keyPrefix`
property of cache components to be null (qiangxue)
-
Chg #3544: Added
`$key`
as parameter of
`yii\grid\DataColumn::value`
(mdmunir)
2.
0.0-beta April 13, 2014
-------------------------
...
...
framework/grid/DataColumn.php
View file @
33727859
...
...
@@ -51,7 +51,7 @@ class DataColumn extends Column
public
$label
;
/**
* @var string|\Closure an anonymous function that returns the value to be displayed for every data model.
* The signature of this function is `function ($model, $index, $widget)`.
* The signature of this function is `function ($model, $
key, $
index, $widget)`.
* If this is not set, `$model[$attribute]` will be used to obtain the value.
*
* You may also set this property to a string representing the attribute name to be displayed in this column.
...
...
@@ -176,7 +176,7 @@ class DataColumn extends Column
if
(
is_string
(
$this
->
value
))
{
return
ArrayHelper
::
getValue
(
$model
,
$this
->
value
);
}
else
{
return
call_user_func
(
$this
->
value
,
$model
,
$index
,
$this
);
return
call_user_func
(
$this
->
value
,
$model
,
$
key
,
$
index
,
$this
);
}
}
elseif
(
$this
->
attribute
!==
null
)
{
return
ArrayHelper
::
getValue
(
$model
,
$this
->
attribute
);
...
...
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