Skip to content

Commit 3e7852c

Browse files
committed
Added default field to relationship select
Only CRUDS can be selected as a relationship
1 parent fd25533 commit 3e7852c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"email": "[email protected]"
1212
}
1313
],
14-
"version": "0.4.3",
14+
"version": "0.4.4",
1515
"require": {
1616
"illuminate/html": "5.0.*@dev",
1717
"intervention/image": "^2.3",

src/Builders/ControllerBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public function relationshipsBuilder()
175175
. ucfirst(Str::camel($menu->name))
176176
. '::lists("'
177177
. $field->relationship_field
178-
. '", "id");'
178+
. '", "id")->prepend(\'Please select\', \'\');'
179179
. "\r\n";
180180
}
181181
}

src/Controllers/QuickadminMenuController.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ public function createCrud()
7373
$fieldTypes = FieldsDescriber::types();
7474
$fieldValidation = FieldsDescriber::validation();
7575
$defaultValuesCbox = FieldsDescriber::default_cbox();
76-
$menusSelect = Menu::lists('title', 'id');
76+
$menusSelect = Menu::whereNotIn('menu_type', [2, 3])->lists('title', 'id');
7777
$roles = Role::all();
7878
$parentsSelect = Menu::where('menu_type', 2)->lists('title', 'id')->prepend('-- no parent --', 'null');
7979
// Get columns for relationship
8080
$models = [];
81-
foreach (Menu::all() as $menu) {
81+
foreach (Menu::whereNotIn('menu_type', [2, 3])->get() as $menu) {
8282
// We are having a default User model
8383
if ($menu->title == 'User' && $menu->is_menu == 0) {
8484
$tableName = 'users';
@@ -336,10 +336,10 @@ public function update(Request $request, $id)
336336
}
337337
$requestArray = $request->all();
338338
if ($requestArray['parent_id'] === "null") {
339-
$requestArray['parent_id'] = NULL;
339+
$requestArray['parent_id'] = null;
340340
}
341341
$requestArray['roles'] = $rolesInsert;
342-
$menu = Menu::findOrFail($id);
342+
$menu = Menu::findOrFail($id);
343343
$menu->update($requestArray);
344344

345345
return redirect()->route('menu');

0 commit comments

Comments
 (0)