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
6e817412
Commit
6e817412
authored
Jan 11, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1903 from BelalWM/master
Fix phpdoc generation in gii model generator.
parents
5c1f274f
7baf261f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Generator.php
extensions/gii/generators/model/Generator.php
+2
-2
No files found.
extensions/gii/generators/model/Generator.php
View file @
6e817412
...
@@ -339,7 +339,7 @@ class Generator extends \yii\gii\Generator
...
@@ -339,7 +339,7 @@ class Generator extends \yii\gii\Generator
$relationName
=
$this
->
generateRelationName
(
$relations
,
$className0
,
$db
->
getTableSchema
(
$table0
),
$table
->
primaryKey
[
1
],
true
);
$relationName
=
$this
->
generateRelationName
(
$relations
,
$className0
,
$db
->
getTableSchema
(
$table0
),
$table
->
primaryKey
[
1
],
true
);
$relations
[
$className0
][
$relationName
]
=
[
$relations
[
$className0
][
$relationName
]
=
[
"return
\$
this->hasMany(
$className1
::className(),
$link
)->viaTable('
{
$table
->
name
}
',
$viaLink
);"
,
"return
\$
this->hasMany(
$className1
::className(),
$link
)->viaTable('
{
$table
->
name
}
',
$viaLink
);"
,
$className
0
,
$className
1
,
true
,
true
,
];
];
...
@@ -348,7 +348,7 @@ class Generator extends \yii\gii\Generator
...
@@ -348,7 +348,7 @@ class Generator extends \yii\gii\Generator
$relationName
=
$this
->
generateRelationName
(
$relations
,
$className1
,
$db
->
getTableSchema
(
$table1
),
$table
->
primaryKey
[
0
],
true
);
$relationName
=
$this
->
generateRelationName
(
$relations
,
$className1
,
$db
->
getTableSchema
(
$table1
),
$table
->
primaryKey
[
0
],
true
);
$relations
[
$className1
][
$relationName
]
=
[
$relations
[
$className1
][
$relationName
]
=
[
"return
\$
this->hasMany(
$className0
::className(),
$link
)->viaTable('
{
$table
->
name
}
',
$viaLink
);"
,
"return
\$
this->hasMany(
$className0
::className(),
$link
)->viaTable('
{
$table
->
name
}
',
$viaLink
);"
,
$className
1
,
$className
0
,
true
,
true
,
];
];
}
}
...
...
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