Unverified Commit c8ae33a0 authored by Viral Solani's avatar Viral Solani Committed by GitHub

Merge pull request #46 from viralsolani/analysis-XNJkOL

Apply fixes from StyleCI
parents 7ba1e24f 918db7cf
...@@ -2,19 +2,18 @@ ...@@ -2,19 +2,18 @@
namespace App\Http\Controllers\Backend\Access\User; namespace App\Http\Controllers\Backend\Access\User;
use App\Models\Access\User\User;
use Illuminate\Support\Facades\DB;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\Access\Permission\Permission;
use App\Repositories\Backend\Access\Role\RoleRepository;
use App\Repositories\Backend\Access\User\UserRepository;
use App\Http\Requests\Backend\Access\User\EditUserRequest;
use App\Http\Requests\Backend\Access\User\ShowUserRequest;
use App\Http\Requests\Backend\Access\User\StoreUserRequest;
use App\Http\Requests\Backend\Access\User\CreateUserRequest; use App\Http\Requests\Backend\Access\User\CreateUserRequest;
use App\Http\Requests\Backend\Access\User\DeleteUserRequest; use App\Http\Requests\Backend\Access\User\DeleteUserRequest;
use App\Http\Requests\Backend\Access\User\EditUserRequest;
use App\Http\Requests\Backend\Access\User\ManageUserRequest; use App\Http\Requests\Backend\Access\User\ManageUserRequest;
use App\Http\Requests\Backend\Access\User\ShowUserRequest;
use App\Http\Requests\Backend\Access\User\StoreUserRequest;
use App\Http\Requests\Backend\Access\User\UpdateUserRequest; use App\Http\Requests\Backend\Access\User\UpdateUserRequest;
use App\Models\Access\Permission\Permission;
use App\Models\Access\User\User;
use App\Repositories\Backend\Access\Role\RoleRepository;
use App\Repositories\Backend\Access\User\UserRepository;
/** /**
* Class UserController. * Class UserController.
...@@ -99,11 +98,11 @@ class UserController extends Controller ...@@ -99,11 +98,11 @@ class UserController extends Controller
$userPermissions = $user->permissions()->get()->pluck('id')->toArray(); $userPermissions = $user->permissions()->get()->pluck('id')->toArray();
return view('backend.access.users.edit')->with([ return view('backend.access.users.edit')->with([
'user' => $user, 'user' => $user,
'userRoles'=> $user->roles->pluck('id')->all(), 'userRoles' => $user->roles->pluck('id')->all(),
'roles' => $this->roles->getAll(), 'roles' => $this->roles->getAll(),
'userPermissions' => $userPermissions , 'userPermissions' => $userPermissions,
'permissions' => $permissions 'permissions' => $permissions,
]); ]);
} }
......
...@@ -28,7 +28,7 @@ class BaseModel extends Model ...@@ -28,7 +28,7 @@ class BaseModel extends Model
* *
* @return array * @return array
*/ */
public static function getItems($collection,$field_name) public static function getItems($collection, $field_name)
{ {
$items = []; $items = [];
...@@ -41,7 +41,7 @@ class BaseModel extends Model ...@@ -41,7 +41,7 @@ class BaseModel extends Model
} }
foreach ($items as $id => $item) { foreach ($items as $id => $item) {
$items[$item['id']] = $item['name']; $items[$item['id']] = $item['name'];
} }
return $items; return $items;
......
...@@ -43,7 +43,7 @@ class UserRepository extends BaseRepository ...@@ -43,7 +43,7 @@ class UserRepository extends BaseRepository
public function __construct(User $model, RoleRepository $role) public function __construct(User $model, RoleRepository $role)
{ {
$this->model = $model; $this->model = $model;
$this->role = $role; $this->role = $role;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment