Skip to content

Commit 3126419

Browse files
committed
menu表增加remark字段
1 parent c8f271b commit 3126419

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

controllers/MenuController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function actionUserMenu()
4444

4545
return $return;
4646
};
47-
$result = MenuHelper::getAssignedMenu(Yii::$app->user->id, null, $callback, Yii::$app->request->get('client'));
47+
$result = MenuHelper::getAssignedMenu(Yii::$app->user->id, null, $callback, false, Yii::$app->request->get('client'));
4848

4949
return $result;
5050
}

migrations/m140602_111327_create_menu_table.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public function up()
2727
'name' => $this->string(128)->notNull(),
2828
'parent' => $this->integer(),
2929
'route' => $this->string(),
30+
'remark' => $this->string(),
3031
'order' => $this->integer(),
3132
'data' => $this->binary(),
3233
"FOREIGN KEY ([[parent]]) REFERENCES {$menuTable}([[id]]) ON DELETE SET NULL ON UPDATE CASCADE",

models/Menu.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function rules()
6363
'range' => static::find()->select(['name'])->column(),
6464
'message' => 'Menu "{value}" not found.'
6565
],
66-
[['parent', 'route', 'data', 'order'], 'default'],
66+
[['parent', 'route', 'data', 'order', 'remark'], 'default'],
6767
[
6868
['parent'],
6969
'filterParent',
@@ -134,6 +134,7 @@ public function attributeLabels()
134134
'route' => 'route',//Yii::t('rbac-admin', 'Route'),
135135
'order' => 'order',//Yii::t('rbac-admin', 'Order'),
136136
'data' => 'data',//Yii::t('rbac-admin', 'Data'),
137+
'remark' => 'remark',//Yii::t('rbac-admin', 'Data'),
137138
];
138139
}
139140

@@ -192,6 +193,7 @@ public function getMenuSource()
192193
'm.route',
193194
'parent_name' => 'p.name',
194195
'm.order',
196+
'm.remark',
195197
'a.description as route_name'
196198
])
197199
->from(['m' => $tableName])

0 commit comments

Comments
 (0)