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
1bee8474
Commit
1bee8474
authored
Nov 01, 2013
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #1060: added code comment
parent
bd821701
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
index.php
framework/yii/gii/generators/crud/templates/views/index.php
+1
-1
ActiveField.php
framework/yii/widgets/ActiveField.php
+1
-0
No files found.
framework/yii/gii/generators/crud/templates/views/index.php
View file @
1bee8474
...
@@ -15,7 +15,7 @@ echo "<?php\n";
...
@@ -15,7 +15,7 @@ echo "<?php\n";
?>
?>
use yii\helpers\Html;
use yii\helpers\Html;
use
<?=
$generator
->
indexWidgetType
===
'grid'
?
"yii\
grid\GridView"
:
"yii\widgets
\ListView"
?>
;
use
<?=
$generator
->
indexWidgetType
===
'grid'
?
"yii
\
\
grid
\\
GridView"
:
"yii
\\
widgets
\
\
ListView"
?>
;
/**
/**
* @var yii\base\View $this
* @var yii\base\View $this
...
...
framework/yii/widgets/ActiveField.php
View file @
1bee8474
...
@@ -324,6 +324,7 @@ class ActiveField extends Component
...
@@ -324,6 +324,7 @@ class ActiveField extends Component
*/
*/
public
function
fileInput
(
$options
=
[])
public
function
fileInput
(
$options
=
[])
{
{
// https://github.com/yiisoft/yii2/pull/795
if
(
$this
->
inputOptions
!==
[
'class'
=>
'form-control'
])
{
if
(
$this
->
inputOptions
!==
[
'class'
=>
'form-control'
])
{
$options
=
array_merge
(
$this
->
inputOptions
,
$options
);
$options
=
array_merge
(
$this
->
inputOptions
,
$options
);
}
}
...
...
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