diff --git a/app/Admin.php b/app/Admin.php index f26526e..0f46077 100644 --- a/app/Admin.php +++ b/app/Admin.php @@ -68,7 +68,7 @@ class Admin extends Authenticatable implements Auditable * @var array */ protected $fillable = [ - 'name', 'username', 'password', + 'name', 'username', 'password','project_ids' ]; /** diff --git a/app/Http/Controllers/Admin/AdminController.php b/app/Http/Controllers/Admin/AdminController.php index ca0c979..3ced192 100644 --- a/app/Http/Controllers/Admin/AdminController.php +++ b/app/Http/Controllers/Admin/AdminController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin; use App\Admin; use App\Forms\AdminForm; +use App\Models\Project; use Illuminate\Http\Request; use Kris\LaravelFormBuilder\FormBuilder; use Spatie\Permission\Models\Role; @@ -19,6 +20,9 @@ class AdminController extends CommonController public function index(Request $request) { $data = $this->model->paginate(20); + foreach ($data as $item) { + $item->projects = Project::whereIn("id", explode(",", $item->project_ids))->get(); + } $roles = (new Role())->where("guard_name", $this->guardName)->get(); return view($this->bladePath . ".index", compact("data", "roles")); diff --git a/resources/views/admin/admin/index.blade.php b/resources/views/admin/admin/index.blade.php index 0ce8e73..eb079e9 100755 --- a/resources/views/admin/admin/index.blade.php +++ b/resources/views/admin/admin/index.blade.php @@ -19,6 +19,7 @@