Skip to content

Commit de5ba46

Browse files
committed
add basemodel
1 parent f84e0ef commit de5ba46

File tree

40 files changed

+125
-70
lines changed

40 files changed

+125
-70
lines changed

app/Http/Controllers/Backend/Access/User/UserController.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22

33
namespace App\Http\Controllers\Backend\Access\User;
44

5+
use App\Models\Access\User\User;
6+
use Illuminate\Support\Facades\DB;
57
use App\Http\Controllers\Controller;
6-
use App\Http\Requests\Backend\Access\User\CreateUserRequest;
7-
use App\Http\Requests\Backend\Access\User\DeleteUserRequest;
8+
use App\Models\Access\Permission\Permission;
9+
use App\Repositories\Backend\Access\Role\RoleRepository;
10+
use App\Repositories\Backend\Access\User\UserRepository;
811
use App\Http\Requests\Backend\Access\User\EditUserRequest;
9-
use App\Http\Requests\Backend\Access\User\ManageUserRequest;
1012
use App\Http\Requests\Backend\Access\User\ShowUserRequest;
1113
use App\Http\Requests\Backend\Access\User\StoreUserRequest;
14+
use App\Http\Requests\Backend\Access\User\CreateUserRequest;
15+
use App\Http\Requests\Backend\Access\User\DeleteUserRequest;
16+
use App\Http\Requests\Backend\Access\User\ManageUserRequest;
1217
use App\Http\Requests\Backend\Access\User\UpdateUserRequest;
13-
use App\Models\Access\User\User;
14-
use App\Repositories\Backend\Access\Role\RoleRepository;
15-
use App\Repositories\Backend\Access\User\UserRepository;
16-
use Illuminate\Support\Facades\DB;
1718

1819
/**
1920
* Class UserController.
@@ -94,7 +95,6 @@ public function show(User $user, ShowUserRequest $request)
9495
*/
9596
public function edit(User $user, EditUserRequest $request)
9697
{
97-
//@todo move queries in to repositery
9898
$userPermissions = DB::table('permission_user')->where('user_id', $user->id)->pluck('permission_id', 'permission_id')->toArray();
9999
$permissions = DB::table('permissions')->pluck('display_name', 'id')->toArray();
100100
ksort($userPermissions);

app/Models/Access/PasswordReset/PasswordReset.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
namespace App\Models\Access\PasswordReset;
44

5-
use Illuminate\Database\Eloquent\Model;
5+
use App\Models\BaseModel;
66

77
/**
88
* Password reset table model.
99
*/
10-
class PasswordReset extends Model
10+
class PasswordReset extends BaseModel
1111
{
1212
public $timestamps = false;
1313
protected $table = 'password_resets';

app/Models/Access/Permission/Permission.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
use App\Models\Access\Permission\Traits\Attribute\PermissionAttribute;
66
use App\Models\Access\Permission\Traits\Relationship\PermissionRelationship;
77
use App\Models\ModelTrait;
8-
use Illuminate\Database\Eloquent\Model;
8+
use App\Models\BaseModel;
99
use Illuminate\Database\Eloquent\SoftDeletes;
1010

1111
/**
1212
* Class Permission.
1313
*/
14-
class Permission extends Model
14+
class Permission extends BaseModel
1515
{
1616
use ModelTrait,
1717
SoftDeletes,

app/Models/Access/Role/Role.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
use App\Models\Access\Role\Traits\RoleAccess;
88
use App\Models\Access\Role\Traits\Scope\RoleScope;
99
use App\Models\ModelTrait;
10-
use Illuminate\Database\Eloquent\Model;
10+
use App\Models\BaseModel;
1111
use Illuminate\Database\Eloquent\SoftDeletes;
1212

1313
/**
1414
* Class Role.
1515
*/
16-
class Role extends Model
16+
class Role extends BaseModel
1717
{
1818
use RoleScope,
1919
ModelTrait,

app/Models/Access/User/SocialLogin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
namespace App\Models\Access\User;
44

5-
use Illuminate\Database\Eloquent\Model;
5+
use App\Models\BaseModel;
66

77
/**
88
* Class SocialLogin.
99
*/
10-
class SocialLogin extends Model
10+
class SocialLogin extends BaseModel
1111
{
1212
/**
1313
* The database table used by the model.

app/Models/Access/User/User.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use App\Models\Access\User\Traits\UserSendPasswordReset;
1010
use Illuminate\Database\Eloquent\SoftDeletes;
1111
use Illuminate\Foundation\Auth\User as Authenticatable;
12+
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
1213
use Illuminate\Notifications\Notifiable;
1314

1415
/**

app/Models/BaseModel.php

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?php namespace App\Models;
2+
3+
use Illuminate\Database\Eloquent\Model;
4+
5+
class BaseModel extends Model
6+
{
7+
/**
8+
* Generate drop-down select data with basic IDs
9+
*
10+
* @param null $id
11+
* @param null $val
12+
* @return array
13+
*/
14+
public static function getSelectData($id = null, $val = null)
15+
{
16+
17+
$collection = parent::all();
18+
return self::getItems($collection);
19+
}
20+
21+
/**
22+
* Generate items for drop-down select data with basic IDs
23+
*
24+
* @param $collection
25+
* @return array
26+
*/
27+
public static function getItems($collection)
28+
{
29+
$items = array();
30+
31+
foreach($collection as $model)
32+
{
33+
$items[$model->id] = [
34+
'id' => $model->id,
35+
'name' => $model->name,
36+
'model' => $model,
37+
];
38+
}
39+
40+
foreach($items as $id => $item)
41+
{
42+
if(isset(static::$selectHTMLFormat) && static::$selectHTMLFormat !== '')
43+
{
44+
$items[$item['id']] = static::generateSelectName($item['model'], static::$selectHTMLFormat);
45+
}
46+
else
47+
{
48+
$items[$item['id']] = $item['name'];
49+
}
50+
}
51+
52+
return $items;
53+
}
54+
}

app/Models/BlogCategories/BlogCategory.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
namespace App\Models\BlogCategories;
44

5-
use App\Models\BlogCategories\Traits\Attribute\BlogCategoryAttribute;
6-
use App\Models\BlogCategories\Traits\Relationship\BlogCategoryRelationship;
5+
use App\Models\BaseModel;
76
use App\Models\ModelTrait;
8-
use Illuminate\Database\Eloquent\Model;
97
use Illuminate\Database\Eloquent\SoftDeletes;
8+
use App\Models\BlogCategories\Traits\Attribute\BlogCategoryAttribute;
9+
use App\Models\BlogCategories\Traits\Relationship\BlogCategoryRelationship;
1010

11-
class BlogCategory extends Model
11+
class BlogCategory extends BaseModel
1212
{
1313
use ModelTrait,
1414
SoftDeletes,

app/Models/BlogMapCategories/BlogMapCategory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace App\Models\BlogMapCategories;
44

5-
use Illuminate\Database\Eloquent\Model;
5+
use App\Models\BaseModel;
66

7-
class BlogMapCategory extends Model
7+
class BlogMapCategory extends BaseModel
88
{
99
/**
1010
* The database table used by the model.

app/Models/BlogMapTags/BlogMapTag.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace App\Models\BlogMapTags;
44

5-
use Illuminate\Database\Eloquent\Model;
5+
use App\Models\BaseModel;
66

7-
class BlogMapTag extends Model
7+
class BlogMapTag extends BaseModel
88
{
99
/**
1010
* The database table used by the model.

0 commit comments

Comments
 (0)