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
f509ed24
Commit
f509ed24
authored
Nov 26, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #6236: No JS scripts should be registered when…
Fixes #6236: No JS scripts should be registered when `yii\widgets\ActiveForm::enableClientScript` is false
parent
0d671ebf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
CHANGELOG.md
framework/CHANGELOG.md
+2
-1
ActiveField.php
framework/widgets/ActiveField.php
+5
-3
No files found.
framework/CHANGELOG.md
View file @
f509ed24
...
...
@@ -32,7 +32,8 @@ Yii Framework 2 Change Log
-
Bug #6107:
`yii message`
was emptying existing translations in .po in case of multiple categories (samdark)
-
Bug #6112:
`yii message`
was incorrectly writing not yet translated strings in .po in case of multiple categories (samdark)
-
Bug #6172:
`yii\rbac\DbManager`
should properly quote table and column names (qiangxue)
-
Bug #6164: Added missing support for
`yii\db\Exression`
to QueryBuilder
`BETWEEN`
and
`LIKE`
conditions (cebe)
-
Bug #6164: Added missing support for
`yii\db\Expression`
to QueryBuilder
`BETWEEN`
and
`LIKE`
conditions (cebe)
-
Bug #6236: No JS scripts should be registered when
`yii\widgets\ActiveForm::enableClientScript`
is false (qiangxue)
-
Bug: Gii console command help information does not contain global options (qiangxue)
-
Bug:
`yii\web\UrlRule`
was unable to create URLs for rules containing unicode characters (samdark)
-
Bug:
`yii\web\AssetManager`
should not publish disabled asset bundles (qiangxue)
...
...
framework/widgets/ActiveField.php
View file @
f509ed24
...
...
@@ -199,9 +199,11 @@ class ActiveField extends Component
*/
public
function
begin
()
{
$clientOptions
=
$this
->
getClientOptions
();
if
(
!
empty
(
$clientOptions
))
{
$this
->
form
->
attributes
[]
=
$clientOptions
;
if
(
$this
->
form
->
enableClientScript
)
{
$clientOptions
=
$this
->
getClientOptions
();
if
(
!
empty
(
$clientOptions
))
{
$this
->
form
->
attributes
[]
=
$clientOptions
;
}
}
$inputID
=
Html
::
getInputId
(
$this
->
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